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

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

@@ -1526 +1526 @@
             mr_free(comment);
 
-            for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                bkpinfo->media_size[i] = atoi(sz_size);
-            }
+            bkpinfo->media_size = atol(sz_size);
             mr_free(sz_size);
 
-            if (bkpinfo->media_size[0] <= 0) {
+            if (bkpinfo->media_size <= 0L) {
                 log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
@@ -1597 +1595 @@
         }
         if (bkpinfo->backup_media_type == cdstream) {
-            for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                bkpinfo->media_size[i] = 650;
-            }
+            bkpinfo->media_size = (long)650;
         }
         break;
@@ -1652 +1648 @@
         mr_msg(4, "sz_size = %s", sz_size);
         mr_free(sz_size);
-        bkpinfo->media_size[0] = 0;
-        mr_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 = 0L;
+        mr_msg(4, "media_size = %ld", bkpinfo->media_size);
+        if (bkpinfo->media_size <= 0L) {
+            bkpinfo->media_size = 0L;
         }
         if (archiving_to_media) {
@@ -1715 +1708 @@
             }
             mr_free(comment);
-            for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                bkpinfo->media_size[i] = atoi(sz_size);
-            }
-            if (bkpinfo->media_size[0] <= 0) {
+            bkpinfo->media_size = atol(sz_size);
+            if (bkpinfo->media_size <= 0L) {
                 log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
@@ -1796 +1787 @@
         mr_msg(3, "prefix set to %s", bkpinfo->prefix);
 
-        for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-            bkpinfo->media_size[i] = 650;
-        }
+        bkpinfo->media_size = (long)650;
         mr_msg(3, "Just set nfs_remote_dir to %s",
                 bkpinfo->nfs_remote_dir);
@@ -1826 +1815 @@
                     finish(1);
                 }
-                for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                    bkpinfo->media_size[i] = atoi(sz_size);
-                }
+                bkpinfo->media_size = atol(sz_size);
             } else {
-                for (i = 0; i <= MAX_NOOF_MEDIA; i++) {
-                    bkpinfo->media_size[i] = 650;
-                }
+                bkpinfo->media_size = (long)650;
             }
         }
@@ -1986 +1971 @@
 
     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", bkpinfo->backup_media_string);
     log_it("prefix = %s", bkpinfo->prefix);
@@ -1996 +1981 @@
     log_it("boot_device = '%s' (loader=%c)", bkpinfo->boot_device,
            bkpinfo->boot_loader);
-    if (bkpinfo->media_size[0] < 0) {
+    if (bkpinfo->media_size < 0L) {
         if (archiving_to_media) {
             fatal_error("Media size is less than zero.");
         } else {
             mr_msg(2, "Warning - media size is less than zero.");
-            bkpinfo->media_size[0] = 0;
+            bkpinfo->media_size = 0L;
         }
     }