Changeset 3190 in MondoRescue for branches/3.1/mondo/src/common/libmondo-string.c

Timestamp:

Sep 25, 2013, 8:55:43 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Modification to 3.1 branch to make it extremely similar to 3.0. What remains are function rewrite with allocation in the function and desallocation outside of the function. Will be next step

File:

• branches/3.1/mondo/src/common/libmondo-string.c (modified) (7 diffs)

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

@@ -141 +141 @@
 
 
-
-
-
-
-
-
-
 /**
  * Turn an entry from the RAID editor's disklist into a GUI-friendly string.
@@ -186 +179 @@
     long outval;
     int i;
-    char *tmp1 = NULL;
+    char *tmp = NULL;
     char ch;
 
@@ -198 +191 @@
     }
 
-    mr_asprintf(tmp1, "%s", incoming);
-    i = (int) strlen(tmp1);
-    if (tmp1[i - 1] == 'B' || tmp1[i - 1] == 'b') {
-        tmp1[i - 1] = '\0';
-    }
-    for (i = 0; i < (int) strlen(tmp1) && isdigit(tmp1[i]); i++);
-    ch = tmp1[i];
-    tmp1[i] = '\0';
-    outval = atol(tmp1);
-    paranoid_free(tmp1);
+    mr_asprintf(tmp, "%s", incoming);
+    i = (int) strlen(tmp);
+    if (tmp[i - 1] == 'B' || tmp[i - 1] == 'b') {
+        tmp[i - 1] = '\0';
+    }
+    for (i = 0; i < (int) strlen(tmp) && isdigit(tmp[i]); i++);
+    ch = tmp[i];
+    tmp[i] = '\0';
+    outval = atol(tmp);
+    mr_free(tmp);
 
     if (ch == 'g' || ch == 'G') {
@@ -224 +217 @@
         fatal_error("Integer overflow.");
     } else if (ch != 'm' && ch != 'M') {
-        mr_asprintf(tmp1, "Re: parameter '%s' - bad multiplier ('%c')", incoming, ch);
-        fatal_error(tmp1);
+        mr_asprintf(tmp, "Re: parameter '%s' - bad multiplier ('%c')", incoming, ch);
+        fatal_error(tmp);
     }
     return (outval);
@@ -1043 +1036 @@
     assert(bkpinfo != NULL);
 
-    if (bkpinfo->media_size[g_current_media_number] <= 0) {
+    if (bkpinfo->media_size <= 0) {
         mr_asprintf(tmp, "%lld", g_tape_posK);
         mr_asprintf(pos_w_commas, "%s", commarize(tmp));
@@ -1052 +1045 @@
     }
 
-/* update screen */
+    /* 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;
@@ -1062 +1053 @@
         mr_asprintf(outstr, "Volume %d: [", g_current_media_number);
     } else {
-        percentage =
-            (int) (space_occupied_by_cd(bkpinfo->scratchdir) * 100 / 1024 /
-                   bkpinfo->media_size[g_current_media_number]);
+        percentage = (int) (space_occupied_by_cd(bkpinfo->scratchdir) * 100 / 1024 / bkpinfo->media_size);
         mds = media_descriptor_string(bkpinfo->backup_media_type);
         mr_asprintf(outstr, "%s %d: [", mds, g_current_media_number);