Changeset 1365 in MondoRescue for branches/stable/mondo/src/mondoarchive/mondo-cli.c

Timestamp:

Apr 30, 2007, 1:50:20 AM (17 years ago)

Author:

Bruno Cornec

Message:

MAX_NOOF_MEDIA is gone and media_size in bkpinfo struct is now a single long field and not an array anymore

File:

• branches/stable/mondo/src/mondoarchive/mondo-cli.c (modified) (4 diffs)

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -92 +92 @@
         flag_set[i] = FALSE;
     }
-    for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
-        bkpinfo->media_size[j] = 650;
-    }                           /* default */
+    bkpinfo->media_size = (long)650;
     res =
         retrieve_switches_from_command_line(argc, argv, flag_val,
@@ -155 +153 @@
     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) {
+    bkpinfo->media_size = 0L;   /* dummy value */
+    for ( p = value; strchr(p, ','); p = strchr(p, ',') + 1) {
         mr_asprintf(&tmp, p);
         q = strchr(tmp, ',');
@@ -163 +160 @@
             *q = '\0';
         }
-        bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(tmp);
+        bkpinfo->media_size = friendly_sizestr_to_sizelong(tmp);
         mr_free(tmp);
 
-        mr_msg(3, "media_size[%d] = %ld", j,
-                bkpinfo->media_size[j]);
-    }
-    for (; j <= MAX_NOOF_MEDIA; j++) {
-        bkpinfo->media_size[j] = friendly_sizestr_to_sizelong(p);
-    }
-    for (j = 1; j <= MAX_NOOF_MEDIA; j++) {
-        if (bkpinfo->media_size[j] <= 0) {
-            mr_msg(1, "You gave media #%d an invalid size\n", j);
-            return (-1);
-        }
+        mr_msg(3, "media_size = %ld", bkpinfo->media_size);
+    }
+    if (bkpinfo->media_size <= 0L) {
+        mr_msg(1, "You gave media an invalid size\n");
+        return (-1);
     }
     return (0);
@@ -469 +460 @@
                 }
             } else if (flag_set['u'] || flag_set['t']) {
-                for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                    bkpinfo->media_size[i] = 0;
-                }
+                bkpinfo->media_size = 0L;
             } else {
                 retval++;