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

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

@@ -600 +600 @@
 
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        mr_asprintf(&tape_size_sz, "%ld", bkpinfo->media_size[1]);
+        mr_asprintf(&tape_size_sz, "%ld", bkpinfo->media_size);
         mr_asprintf(&tape_device, bkpinfo->media_device);
     } else {
@@ -843 +843 @@
         mr_fprintf(fd, "mindi_tape_device=%s\n", bkpinfo->media_device);
         mr_fprintf(fd1, "media-dev=%s\n", bkpinfo->media_device);
-        mr_fprintf(fd1, "media-size=%ld\n", bkpinfo->media_size[1]);
+        mr_fprintf(fd1, "media-size=%ld\n", bkpinfo->media_size);
     }
     if (bkpinfo->compression_level > 0) {
@@ -2540 +2540 @@
     va_end(ap);
 
-    if (bkpinfo->media_size[g_current_media_number] <= 0) {
+    if (bkpinfo->media_size <= 0L) {
         fatal_error("move_files_to_cd() - unknown media size");
     }
-    if (would_occupy / 1024 > bkpinfo->media_size[g_current_media_number]) {
+    if (would_occupy / 1024 > bkpinfo->media_size) {
         /* FALSE because this is not the last CD we'll write */
         res = write_iso_and_go_on(bkpinfo, FALSE);
@@ -3570 +3570 @@
     assert(bkpinfo != NULL);
     orig_vfy_flag_val = bkpinfo->verify_data;
-    if (bkpinfo->media_size[g_current_media_number] <= 0) {
+    if (bkpinfo->media_size <= 0L) {
         fatal_error("write_iso_and_go_on() - unknown media size");
     }
@@ -3614 +3614 @@
     mr_free(lastcd_fname);
 
-    if (space_occupied_by_cd(bkpinfo->scratchdir) / 1024 >
-        bkpinfo->media_size[g_current_media_number]) {
+    if (space_occupied_by_cd(bkpinfo->scratchdir) / 1024 > bkpinfo->media_size) {
         mr_asprintf(&tmp,
                 "Warning! %s is too big. It occupies %ld KB, which is more than the %ld KB allowed.",
                 media_descriptor_string(bkpinfo->backup_media_type),
                 (long) space_occupied_by_cd(bkpinfo->scratchdir),
-                (long) bkpinfo->media_size[g_current_media_number]);
+                bkpinfo->media_size);
         log_to_screen(tmp);
         mr_free(tmp);
@@ -3679 +3678 @@
 
     g_current_media_number++;
-    if (g_current_media_number > MAX_NOOF_MEDIA) {
-        fatal_error("Too many CD-R(W)'s. Use tape or net.");
-    }
     wipe_archives(bkpinfo->scratchdir);
     mr_asprintf(&tmp, "rm -Rf %s/images/*gz %s/images/*data*img",