Changeset 2313 in MondoRescue

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

Location:

branches/2.2.10/mondo/src

Files:

• common/libmondo-archive.c (modified) (6 diffs)
• common/libmondo-string.c (modified) (4 diffs)
• mondorestore/mondo-rstr-newt.c (modified) (4 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"))) {

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

@@ -155 +155 @@
         tmp[j - 6] = ',';
         strcpy(tmp + j - 5, pos_w_commas + j - 6);
-//      tmp[j-2] = ',';
-//      strcpy(tmp+j-1, pos_w_commas+j-3);
         strcpy(pos_w_commas, tmp);
     }
@@ -1087 +1085 @@
     /*@ int *********************************************** */
     int percentage;
-    int j;
 
     /*@ buffers ******************************************* */
-    static char outstr[MAX_STR_LEN];
+    char *outstr = NULL;
     char *pos_w_commas, *tmp;
     char *mds = NULL;
 
     assert(bkpinfo != NULL);
-    malloc_string(pos_w_commas);
-    malloc_string(tmp);
-    sprintf(tmp, "%lld", g_tape_posK);
-    strcpy(pos_w_commas, commarize(tmp));
-
-
-
-    if (bkpinfo->media_size[g_current_media_number] <= 0)
-//    { fatal_error( "percentage_media_full_comment() - unknown media size"); }
-    {
-        sprintf(outstr, "Volume %d: %s kilobytes archived so far",
-                g_current_media_number, pos_w_commas);
+
+    if (bkpinfo->media_size[g_current_media_number] <= 0) {
+        malloc_string(pos_w_commas);
+        malloc_string(tmp);
+        sprintf(tmp, "%lld", g_tape_posK);
+        strcpy(pos_w_commas, commarize(tmp));
+        paranoid_free(tmp);
+        mr_asprintf(&outstr, "Volume %d: %s kilobytes archived so far", g_current_media_number, pos_w_commas);
+        paranoid_free(pos_w_commas);
         return (outstr);
     }
@@ -1118 +1112 @@
             percentage = 100;
         }
-        sprintf(outstr, "Volume %d: [", g_current_media_number);
+        mr_asprintf(&outstr, "Volume %d: [", g_current_media_number);
     } else {
         percentage =
@@ -1124 +1118 @@
                    bkpinfo->media_size[g_current_media_number]);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
-        sprintf(outstr, "%s %d: [", mds, g_current_media_number);
+        mr_asprintf(&outstr, "%s %d: [", mds, g_current_media_number);
         mr_free(mds);
     }
     for (j = 0; j < percentage; j += 5) {
-        strcat(outstr, "*");
+        mr_strcat(outstr, "*");
     }
     for (; j < 100; j += 5) {
-        strcat(outstr, ".");
-    }
-    j = (int) strlen(outstr);
-    sprintf(outstr + j, "] %d%% used", percentage);
-    paranoid_free(pos_w_commas);
-    paranoid_free(tmp);
+        mr_strcat(outstr, ".");
+    }
+    mr_strcat(outstr, "] %d%% used", percentage);
     return (outstr);
 }

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-newt.c

@@ -1588 +1588 @@
     malloc_string(sz_parity_disks);
     malloc_string(sz_failed_disks);
-    if (!(bkp_raidrec = malloc(sizeof(struct raid_device_record)))) {
-        fatal_error("Cannot malloc space for raidrec");
-    }
-
+
+    bkp_raidrec = mr_malloc(sizeof(struct raid_device_record));
     log_it("Started edit_raidlist_entry");
 
-    memcpy((void *) bkp_raidrec, (void *) raidrec,
-           sizeof(struct raid_device_record));
+    memcpy((void *) bkp_raidrec, (void *) raidrec, sizeof(struct raid_device_record));
     sprintf(title_of_editraidForm_window, "%s", raidrec->raid_device);
     log_msg(2, "Opening newt window");
@@ -1637 +1634 @@
             choose_raid_level(raidrec);
         } else if (b_res == bSelectData) {
-            select_raid_disks(mountlist, raidlist, raidrec, "data",
-                              &raidrec->data_disks);
+            select_raid_disks(mountlist, raidlist, raidrec, "data", &raidrec->data_disks);
         } else if (b_res == bSelectSpare) {
-            select_raid_disks(mountlist, raidlist, raidrec, "spare",
-                              &raidrec->spare_disks);
+            select_raid_disks(mountlist, raidlist, raidrec, "spare", &raidrec->spare_disks);
         } else if (b_res == bSelectParity) {
-            select_raid_disks(mountlist, raidlist, raidrec, "parity",
-                              &raidrec->parity_disks);
+            select_raid_disks(mountlist, raidlist, raidrec, "parity", &raidrec->parity_disks);
         } else if (b_res == bSelectFailed) {
-            select_raid_disks(mountlist, raidlist, raidrec, "failed",
-                              &raidrec->failed_disks);
+            select_raid_disks(mountlist, raidlist, raidrec, "failed", &raidrec->failed_disks);
         } else if (b_res == bAdditional) {
             edit_raidrec_additional_vars(raidrec);
@@ -1657 +1650 @@
     }
     if (b_res == bCancel) {
-        memcpy((void *) raidrec, (void *) bkp_raidrec,
-               sizeof(struct raid_device_record));
+        memcpy((void *) raidrec, (void *) bkp_raidrec, sizeof(struct raid_device_record));
     }
     newtPopHelpLine();
     newtPopWindow();
-    mountlist->el[currline].size =
-        calculate_raid_device_size(mountlist, raidlist,
-                                   raidrec->raid_device);
+    mountlist->el[currline].size = calculate_raid_device_size(mountlist, raidlist, raidrec->raid_device);
     paranoid_free(title_of_editraidForm_window);
     paranoid_free(sz_raid_level);
@@ -1873 +1863 @@
 
 if (b_res == bCancel) {
-    memcpy((void *) raidrec, (void *) &bkp_raidrec,
-           sizeof(struct vinum_plex));
+    memcpy((void *) raidrec, (void *) &bkp_raidrec, sizeof(struct vinum_plex));
 }
 newtPopWindow();