Changeset 1645 in MondoRescue for branches/2.2.5/mondo/src/mondorestore/mondo-rstr-compare.c

Timestamp:

Sep 24, 2007, 3:04:43 AM (17 years ago)

Author:

Bruno Cornec

Message:

Render bkpinfo global (potential issue on thread, but should not be a problem as that structure is indeed static during archive)
Should solve the tmpdir issue from previous rev.
May still not compile

File:

• branches/2.2.5/mondo/src/mondorestore/mondo-rstr-compare.c (modified) (18 diffs)

branches/2.2.5/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -67 +67 @@
 extern char *MONDO_LOGFILE;
 
+/* Reference to global bkpinfo */
+extern struct s_bkpinfo *bkpinfo;
+
 //static char cvsid[] = "$Id$";
 
@@ -82 +85 @@
  * @note This function uses an MD5 checksum.
  */
-int compare_a_biggiefile(struct s_bkpinfo *bkpinfo, long bigfileno)
+int compare_a_biggiefile(long bigfileno)
 {
 
@@ -127 +130 @@
     if (!does_file_exist(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""))) {
         if (does_file_exist(MNT_CDROM "/archives/NOT-THE-LAST")) {
-            insist_on_this_cd_number(bkpinfo, (++g_current_media_number));
+            insist_on_this_cd_number((++g_current_media_number));
         } else {
             sprintf(tmp_ptr,
@@ -230 +233 @@
 /**
  * Compare all biggiefiles in the backup.
- * @param bkpinfo The backup information structure. Used only in compare_a_biggiefile().
  * @return 0 for success, nonzero for failure.
  */
-int compare_all_biggiefiles(struct s_bkpinfo *bkpinfo)
+int compare_all_biggiefiles()
 {
     int retval = 0;
@@ -240 +242 @@
     char tmp[MAX_STR_LEN];
 
-    assert(bkpinfo != NULL);
     log_msg(1, "Comparing biggiefiles");
 
@@ -263 +264 @@
         log_msg(1, tmp);
         update_progress_form(tmp);
-        res = compare_a_biggiefile(bkpinfo, bigfileno);
+        res = compare_a_biggiefile(bigfileno);
         retval += res;
         g_current_progress++;
@@ -417 +418 @@
  * @return 0 for success, nonzero for failure.
  */
-int compare_all_tarballs(struct s_bkpinfo *bkpinfo)
+int compare_all_tarballs()
 {
     int retval = 0;
@@ -449 +450 @@
 
     for (;;) {
-        insist_on_this_cd_number(bkpinfo, g_current_media_number);
+        insist_on_this_cd_number(g_current_media_number);
         update_progress_form(progress_str);
         sprintf(tarball_fname,
@@ -523 +524 @@
  * @return 0 for success, nonzero for failure.
  */
-int compare_to_CD(struct s_bkpinfo *bkpinfo)
+int compare_to_CD()
 {
   /** needs malloc *********/
@@ -541 +542 @@
     chdir(bkpinfo->restore_path);
     getcwd(new, MAX_STR_LEN - 1);
-    insist_on_this_cd_number(bkpinfo, g_current_media_number);
+    insist_on_this_cd_number(g_current_media_number);
     unlink(MINDI_CACHE"/changed.txt");
 
-    resA = compare_all_tarballs(bkpinfo);
-    resB = compare_all_biggiefiles(bkpinfo);
+    resA = compare_all_tarballs();
+    resB = compare_all_biggiefiles();
     chdir(cwd);
     noof_changed_files = count_lines_in_file(MINDI_CACHE"/changed.txt");
@@ -586 +587 @@
  */
 int
-compare_mode(struct s_bkpinfo *bkpinfo,
-             struct mountlist_itself *mountlist,
+compare_mode(struct mountlist_itself *mountlist,
              struct raidlist_itself *raidlist)
 {
@@ -608 +608 @@
     assert(raidlist != NULL);
 
-    while (get_cfg_file_from_archive(bkpinfo)) {
+    while (get_cfg_file_from_archive()) {
         if (!ask_me_yes_or_no
             ("Failed to find config file/archives. Choose another source?"))
@@ -614 +614 @@
             fatal_error("Unable to find config file/archives. Aborting.");
         }
-        interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
-    }
-
-    read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
+        interactively_obtain_media_parameters_from_user(FALSE);
+    }
+
+    read_cfg_file_into_bkpinfo(g_mondo_cfg_file);
     g_current_media_number = 1;
     mvaddstr_and_log_it(1, 30, "Comparing Automatically");
@@ -629 +629 @@
     if (bkpinfo->backup_media_type == tape
         || bkpinfo->backup_media_type == udev) {
-        retval += compare_to_tape(bkpinfo);
+        retval += compare_to_tape();
     } else if (bkpinfo->backup_media_type == cdstream) {
-        retval += compare_to_cdstream(bkpinfo);
-    } else {
-        retval += compare_to_CD(bkpinfo);
+        retval += compare_to_cdstream();
+    } else {
+        retval += compare_to_CD();
     }
     if (retval) {
@@ -695 +695 @@
  * @return 0 for success, nonzero for failure.
  */
-int compare_to_cdstream(struct s_bkpinfo *bkpinfo)
+int compare_to_cdstream()
 {
     int res;
@@ -721 +721 @@
         find_cdrom_device(bkpinfo->media_device, FALSE);
     }
-    res = verify_tape_backups(bkpinfo);
+    res = verify_tape_backups();
     chdir(dir);
     if (length_of_file(MINDI_CACHE"/changed.txt") > 2
@@ -754 +754 @@
  * returns: int                                                           *
  **************************************************************************/
-int compare_to_tape(struct s_bkpinfo *bkpinfo)
+int compare_to_tape()
 {
     int res;
@@ -770 +770 @@
     mvaddstr_and_log_it(g_currentY,
                         0, "Verifying archives against filesystem");
-    res = verify_tape_backups(bkpinfo);
+    res = verify_tape_backups();
     chdir(dir);
     if (res) {