Changeset 2313 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.c

Timestamp:

Aug 18, 2009, 2:29:11 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3324@localhost: bruno | 2009-07-31 23:42:57 +0200
percent_media_full_comment now allocates memory

File:

• branches/2.2.10/mondo/src/common/libmondo-archive.c (modified) (6 diffs)

branches/2.2.10/mondo/src/common/libmondo-archive.c

@@ -1407 +1407 @@
             if (!get_bit_N_of_array
                 (p_list_of_fileset_flags, storing_set_no)) {
-            misc_counter_that_is_not_important =
-                (misc_counter_that_is_not_important + 1) % 5;
-            /* BCO the media_usage_comment is not really initialized there !
-            if (!misc_counter_that_is_not_important) {
-                update_progress_form(media_usage_comment);
-            }
-            */
-            sleep(1);
+                misc_counter_that_is_not_important = (misc_counter_that_is_not_important + 1) % 5;
+                sleep(1);
             } else {
                 // store set N
@@ -1434 +1428 @@
                     sleep(5);
                 }
-                mr_asprintf(&media_usage_comment, "%s", percent_media_full_comment());
                 /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
                 if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -1474 +1467 @@
                 retval += res;
                 g_current_progress++;
+
+                media_usage_comment = percent_media_full_comment();
                 update_progress_form(media_usage_comment);
                 mr_free(media_usage_comment);
@@ -2215 +2210 @@
         }
 
-        mr_asprintf(&media_usage_comment, "%s", percent_media_full_comment());
-
         /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
         if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -2258 +2251 @@
         retval += res;
         g_current_progress++;
+
+        media_usage_comment = percent_media_full_comment();
         update_progress_form(media_usage_comment);
         mr_free(media_usage_comment);
@@ -3034 +3029 @@
         mr_asprintf(&curr_slice_fname_compressed, "%s", slice_fname(biggie_file_number, slice_num, bkpinfo->tmpdir, suffix));
 
-        mr_asprintf(&tmp, "%s", percent_media_full_comment());
+        
+        tmp = percent_media_full_comment();
         update_progress_form(tmp);
-        paranoid_free(tmp);
+        mr_free(tmp);
 
         if (!(fout = fopen(curr_slice_fname_uncompressed, "w"))) {