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

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

@@ -562 +562 @@
 
     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);
         ntapedev = get_non_rewind_dev(bkpinfo->media_device);
         if ((bkpinfo->use_obdr) && (ntapedev != NULL)) {
@@ -2546 +2546 @@
     va_end(ap);
 
-    if (bkpinfo->media_size[g_current_media_number] <= 0) {
+    if (bkpinfo->media_size <= 0) {
         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) {
         res = write_iso_and_go_on(FALSE);   /* FALSE because this is not the last CD we'll write */
         retval += res;
@@ -3347 +3347 @@
     assert(bkpinfo != NULL);
     orig_vfy_flag_val = bkpinfo->verify_data;
-    if (bkpinfo->media_size[g_current_media_number] <= 0) {
+    if (bkpinfo->media_size <= 0) {
         fatal_error("write_iso_and_go_on() - unknown media size");
     }
@@ -3380 +3380 @@
         paranoid_fclose(fout);
     }
-    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) {
         sprintf(tmp,
                 "Warning! CD is too big. It occupies %ld KB, which is more than the %ld KB allowed.",
                 (long) space_occupied_by_cd(bkpinfo->scratchdir),
-                (long) bkpinfo->media_size[g_current_media_number]);
+                (long) bkpinfo->media_size);
         log_to_screen(tmp);
     }
@@ -3445 +3444 @@
     }
     g_current_media_number++;
-    if (g_current_media_number > MAX_NOOF_MEDIA) {
-        fatal_error("Too many media. Use tape or net.");
-    }
     wipe_archives(bkpinfo->scratchdir);
     sprintf(tmp, "rm -Rf %s/images/*gz %s/images/*data*img",