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

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

@@ -2277 +2277 @@
                 finish(1);
             }
-            for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                bkpinfo->media_size[i] = atoi(sz_size);
-            }
-            if (bkpinfo->media_size[0] <= 0) {
+            bkpinfo->media_size = atoi(sz_size);
+            if (bkpinfo->media_size <= 0) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
@@ -2357 +2355 @@
 
         if (bkpinfo->backup_media_type == cdstream) {
-            for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                bkpinfo->media_size[i] = 650;
-            }
+            bkpinfo->media_size = 650;
         }
         break;
@@ -2415 +2411 @@
 
         if (sz_size[0] == '\0') {
-            bkpinfo->media_size[0] = 0;
+            bkpinfo->media_size = 0;
         } else {
-            bkpinfo->media_size[0] =
-                friendly_sizestr_to_sizelong(sz_size) / 2 - 50;
-        }
-        log_msg(4, "media_size[0] = %ld", bkpinfo->media_size[0]);
-        if (bkpinfo->media_size[0] <= 0) {
-            bkpinfo->media_size[0] = 0;
-        }
-        for (i = 1; i <= MAX_NOOF_MEDIA; i++) {
-            bkpinfo->media_size[i] = bkpinfo->media_size[0];
+            bkpinfo->media_size = friendly_sizestr_to_sizelong(sz_size) / 2 - 50;
+        }
+        log_msg(4, "media_size = %ld", bkpinfo->media_size);
+        if (bkpinfo->media_size <= 0) {
+            bkpinfo->media_size = 0;
         }
         bkpinfo->use_obdr = ask_me_yes_or_no
@@ -2511 +2503 @@
                 strcpy(sz_size, "0");
             }
-            for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                bkpinfo->media_size[i] = atoi(sz_size);
-            }
-            if (bkpinfo->media_size[0] < 0) {
+            bkpinfo->media_size = atoi(sz_size);
+            if (bkpinfo->media_size < 0) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
@@ -2658 +2648 @@
                     finish(1);
                 }
-                for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                    bkpinfo->media_size[i] = atoi(sz_size);
-                }
+                bkpinfo->media_size = atoi(sz_size);
             } else {
-                for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                    bkpinfo->media_size[i] = 650;
-                }
+                bkpinfo->media_size = 650;
             }
         }
@@ -2870 +2856 @@
 
     log_it("media device = %s", bkpinfo->media_device);
-    log_it("media size = %ld", bkpinfo->media_size[1]);
+    log_it("media size = %ld", bkpinfo->media_size);
     log_it("media type = %s", bkptype_to_string(bkpinfo->backup_media_type));
     log_it("prefix = %s", bkpinfo->prefix);
@@ -2888 +2874 @@
     log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device,
            bkpinfo->boot_loader);
-    if (bkpinfo->media_size[0] < 0) {
+    if (bkpinfo->media_size < 0) {
         if (archiving_to_media) {
             fatal_error("Media size is less than zero.");
         } else {
             log_msg(2, "Warning - media size is less than zero.");
-            bkpinfo->media_size[0] = 0;
+            bkpinfo->media_size = 0;
         }
     }