Changeset 3150 in MondoRescue for branches/3.0/mondo/src/common/libmondo-string.c

Timestamp:

Jun 21, 2013, 6:48:23 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Fix #706 by removing usage of MAX_NOOF_MEDIA and an array for media_size in bkpinfo.

File:

• branches/3.0/mondo/src/common/libmondo-string.c (modified) (5 diffs)

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

@@ -222 +222 @@
     assert_string_is_neither_NULL_nor_zerolength(incoming);
 
-    malloc_string(tmp);
     if (!incoming[0]) {
-        free(tmp);
         return (0);
     }
@@ -230 +228 @@
         fatal_error("Please use integers only. No decimal points.");
     }
+    malloc_string(tmp);
     strcpy(tmp, incoming);
     i = (int) strlen(tmp);
@@ -1076 +1075 @@
 
 
-    if (bkpinfo->media_size[g_current_media_number] <= 0)
+    if (bkpinfo->media_size <= 0)
 //    { fatal_error( "percentage_media_full_comment() - unknown media size"); }
     {
@@ -1086 +1085 @@
 /* update screen */
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        percentage =
-            (int) (g_tape_posK / 10 /
-                   bkpinfo->media_size[g_current_media_number]);
+        percentage = (int) (g_tape_posK / 10 / bkpinfo->media_size);
         if (percentage > 100) {
             percentage = 100;
@@ -1095 +1092 @@
     } else {
         percentage =
-            (int) (space_occupied_by_cd(bkpinfo->scratchdir) * 100 / 1024 /
-                   bkpinfo->media_size[g_current_media_number]);
+            (int) (space_occupied_by_cd(bkpinfo->scratchdir) * 100 / 1024 / bkpinfo->media_size);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
         sprintf(outstr, "%s %d: [", mds, g_current_media_number);