Changeset 87 in MondoRescue for trunk/mondo/mondo/common/libmondo-archive.c

Timestamp:

Oct 27, 2005, 10:03:00 PM (18 years ago)

Author:

bcornec

Message:

• Now use -Wall to compile
• asprintf for newt-specific.c
• Bug in libmondo-string.c line 1120: if we use %% in this format, then the percentage is printeed wrongly (after the real percentage we have a huge number)

File:

• trunk/mondo/mondo/common/libmondo-archive.c (modified) (10 diffs)

trunk/mondo/mondo/common/libmondo-archive.c

@@ -2 +2 @@
 
 subroutines to handle the archiving of files
-
 */
 
@@ -514 +513 @@
  * - @c media_size
  * - @c nonbootable_backup
- * - @c scratchdir
  * - @c tmpdir
  * - @c use_lzo
@@ -528 +526 @@
     /*@ buffer ************************************************************ */
     char *tmp;
-    char *scratchdir;
     char *command;
     char *use_lzo_sz;
@@ -871 +868 @@
 
     //  popup_and_OK("Pausing");
-
     res = run_program_and_log_to_screen(command,
                                         "Generating boot+data disks");
@@ -1508 +1504 @@
                 (misc_counter_that_is_not_important + 1) % 5;
             /* BERLIOS: media_usage_comment was NOT initialized !!! */
-            /* maybe : */
-            asprintf(&media_usage_comment, "%s",
-                     percent_media_full_comment(bkpinfo));
+            /* maybe  */
+            tmp = percent_media_full_comment(bkpinfo);
+            asprintf(&media_usage_comment, "%s", tmp);
+            paranoid_free(tmp);
             if (!misc_counter_that_is_not_important) {
                 update_progress_form(media_usage_comment);
@@ -1535 +1532 @@
                 sleep(5);
             }
-            asprintf(&media_usage_comment, "%s",
-                     percent_media_full_comment(bkpinfo));
+            tmp = percent_media_full_comment(bkpinfo);
+            asprintf(&media_usage_comment, "%s", tmp);
+            paranoid_free(tmp);
             /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -1644 +1642 @@
     char *message_to_screen;
     char *sz_blank_disk;
-    char *fnam;
     char *tmp2;
     char *tmp3;
@@ -2186 +2183 @@
         }
 
-        asprintf(&media_usage_comment, "%s",
-                 percent_media_full_comment(bkpinfo));
+        tmp = percent_media_full_comment(bkpinfo);
+        asprintf(&media_usage_comment, "%s", tmp);
+        paranoid_free(tmp);
 
         /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
@@ -3167 +3165 @@
                              bkpinfo->tmpdir, suffix));
 
-        asprintf(&tmp, "%s", percent_media_full_comment(bkpinfo));
+        tmp = percent_media_full_comment(bkpinfo);
         update_progress_form(tmp);
         paranoid_free(tmp);
@@ -3380 +3378 @@
     asprintf(&tmp, "Writing the final ISO");
     log_msg(2, tmp);
-    /* BERLIOS: that function seems strange to me
-       center_string(tmp, 80);
-     */
+    /* BERLIOS: center_string is now broken
+    center_string(tmp, 80);
+    */
 #ifndef _XWIN
     if (!g_text_mode) {