Changeset 3150 in MondoRescue for branches/3.0/mondo/src/common/libmondo-cli.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-cli.c (modified) (3 diffs)

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

@@ -86 +86 @@
         flag_set[i] = FALSE;
     }
-    for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
-        bkpinfo->media_size[j] = 650;
-    }                           /* default */
-    res =
-        retrieve_switches_from_command_line(argc, argv, flag_val,
-                                            flag_set);
+    bkpinfo->media_size = 650; /* default */
+    res = retrieve_switches_from_command_line(argc, argv, flag_val, flag_set);
     retval += res;
     if (!retval) {
@@ -145 +141 @@
     assert(value != NULL);
 
-    bkpinfo->media_size[0] = -1;    /* dummy value */
-    for (j = 1, p = value; j < MAX_NOOF_MEDIA && strchr(p, ',');
-         j++, p = strchr(p, ',') + 1) {
-        strncpy(tmp, p, MAX_STR_LEN);
-        *(strchr(tmp, ',')) = '\0';
-        bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(tmp);
-        sprintf(comment, "media_size[%d] = %ld", j,
-                bkpinfo->media_size[j]);
-        log_msg(3, comment);
-    }
-    for (; j <= MAX_NOOF_MEDIA; j++) {
-        bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(p);
-    }
-//      bkpinfo->media_size[0] = bkpinfo->media_size[MAX_NOOF_MEDIA];
-    for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
-        if (bkpinfo->media_size[j] <= 0) {
-            log_msg(1, "You gave media #%d an invalid size\n", j);
-            return (-1);
-        }
+    bkpinfo->media_size = -1;   /* dummy value */
+    bkpinfo->media_size = friendly_sizestr_to_sizelong(p);
+    log_msg(3, "media_size = %ld", bkpinfo->media_size);
+    if (bkpinfo->media_size <= 0) {
+        log_msg(1, "You gave media an invalid size %s\n", p);
+        return (-1);
     }
     return (0);
@@ -461 +444 @@
                 }
             } else if (flag_set['u'] || flag_set['t']) {
-                for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                    bkpinfo->media_size[i] = 0;
-                }
+                bkpinfo->media_size = 0;
             } else {
                 retval++;