Changeset 2215 in MondoRescue for branches

Timestamp:

Jun 4, 2009, 8:08:57 PM (16 years ago)

Author:

Bruno Cornec

Message:

Fix a compilation error following previous modifs

File:

• branches/2.2.9/mondo/src/common/libmondo-archive.c (modified) (1 diff)

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

@@ -1441 +1441 @@
             if (!misc_counter_that_is_not_important) {
                 update_progress_form(media_usage_comment);
-                */
             }
+            */
             sleep(1);
-        } else
-            // store set N
-        {
-            sprintf(storing_filelist_fname, FILELIST_FNAME_RAW_SZ,
-                    bkpinfo->tmpdir, storing_set_no);
-            sprintf(storing_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
-                    bkpinfo->tmpdir, storing_set_no, bkpinfo->zip_suffix);
-            if (g_getfattr) {
-                sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
-                    bkpinfo->tmpdir, storing_set_no);
-            }
-            if (g_getfacl) {
-                sprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
-                    bkpinfo->tmpdir, storing_set_no);
-            }
-
-            log_msg(2, "Storing set %d", storing_set_no);
-            while (!does_file_exist(storing_filelist_fname)
-                   || !does_file_exist(storing_afioball_fname)) {
-                log_msg(2,
-                        "Warning - either %s or %s doesn't exist yet. I'll pause 5 secs.",
+            } else
+                // store set N
+            {
+                sprintf(storing_filelist_fname, FILELIST_FNAME_RAW_SZ,
+                        bkpinfo->tmpdir, storing_set_no);
+                sprintf(storing_afioball_fname, AFIOBALL_FNAME_RAW_SZ,
+                        bkpinfo->tmpdir, storing_set_no, bkpinfo->zip_suffix);
+                if (g_getfattr) {
+                    sprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
+                        bkpinfo->tmpdir, storing_set_no);
+                }
+                if (g_getfacl) {
+                    sprintf(curr_acl_list_fname, ACL_LIST_FNAME_RAW_SZ,
+                        bkpinfo->tmpdir, storing_set_no);
+                }
+
+                log_msg(2, "Storing set %d", storing_set_no);
+                while (!does_file_exist(storing_filelist_fname)
+                    || !does_file_exist(storing_afioball_fname)) {
+                    log_msg(2,
+                            "Warning - either %s or %s doesn't exist yet. I'll pause 5 secs.",
                         storing_filelist_fname, storing_afioball_fname);
-                sleep(5);
-            }
-            mr_asprintf(&media_usage_comment, "%s", percent_media_full_comment());
-            /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
-            if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-                register_in_tape_catalog(fileset, storing_set_no, -1,
+                    sleep(5);
+                }
+                mr_asprintf(&media_usage_comment, "%s", percent_media_full_comment());
+                /* copy to CD (scratchdir) ... and an actual CD-R if necessary */
+                if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
+                    register_in_tape_catalog(fileset, storing_set_no, -1,
                                          storing_afioball_fname);
-                maintain_collection_of_recent_archives(bkpinfo->tmpdir,
+                    maintain_collection_of_recent_archives(bkpinfo->tmpdir,
                                                        storing_afioball_fname);
-                iamhere("Writing EXAT files");
-                res +=
-                    write_EXAT_files_to_tape(curr_xattr_list_fname,
+                    iamhere("Writing EXAT files");
+                    res +=
+                        write_EXAT_files_to_tape(curr_xattr_list_fname,
                                              curr_acl_list_fname);
-                // archives themselves
-                res +=
-                    move_files_to_stream(storing_afioball_fname,
+                    // archives themselves
+                    res +=
+                        move_files_to_stream(storing_afioball_fname,
                                          NULL);
-            } else {
-                if (g_getfacl) {
-                    if (g_getfattr) {
-                        res = move_files_to_cd(storing_filelist_fname,
+                } else {
+                    if (g_getfacl) {
+                        if (g_getfattr) {
+                            res = move_files_to_cd(storing_filelist_fname,
                                      curr_xattr_list_fname,
                                      curr_acl_list_fname,
                                      storing_afioball_fname, NULL);
-                    } else {
-                        res = move_files_to_cd(storing_filelist_fname,
+                        } else {
+                            res = move_files_to_cd(storing_filelist_fname,
                                     curr_acl_list_fname,
                                     storing_afioball_fname, NULL);
-                    }
-                } else {
-                    if (g_getfattr) {
+                        }
+                    } else {
+                        if (g_getfattr) {
                             res = move_files_to_cd(storing_filelist_fname,
                                     curr_xattr_list_fname,
                                     storing_afioball_fname, NULL);
-                    } else {
+                        } else {
                             res = move_files_to_cd(storing_filelist_fname,
                                     storing_afioball_fname, NULL);
+                        }
                     }
                 }
-            }
-            retval += res;
-            g_current_progress++;
-            update_progress_form(media_usage_comment);
-            mr_free(media_usage_comment);
-            if (res) {
-                mr_asprintf(&tmp,
+                retval += res;
+                g_current_progress++;
+                update_progress_form(media_usage_comment);
+                mr_free(media_usage_comment);
+                if (res) {
+                    mr_asprintf(&tmp,
                         "Failed to add archive %ld's files to CD dir\n",
                         storing_set_no);
-                log_to_screen(tmp);
-                paranoid_free(tmp);
-                fatal_error
-                    ("Is your hard disk full? If not, please send the author the logfile.");
-            }
-            storing_set_no++;
-            //      sleep(2);
+                    log_to_screen(tmp);
+                    paranoid_free(tmp);
+                    fatal_error
+                        ("Is your hard disk full? If not, please send the author the logfile.");
+                }
+                storing_set_no++;
+                //      sleep(2);
         }
     }