Changeset 541 in MondoRescue for branches/stable/mondo/mondo/common/libmondo-verify.c

Timestamp:

May 13, 2006, 8:47:23 PM (18 years ago)

Author:

bcornec

Message:

Stable is reverted to r436 (2.0.7) to put it in line with 2.0.8 and start from there over

File:

• branches/stable/mondo/mondo/common/libmondo-verify.c (modified) (14 diffs)

branches/stable/mondo/mondo/common/libmondo-verify.c

@@ -103 +103 @@
 #include "mondostructures.h"
 #include "libmondo-verify.h"
-#include "newt-specific-EXT.h"
+#include "libmondo-gui-EXT.h"
 #include "libmondo-files-EXT.h"
 #include "libmondo-fork-EXT.h"
@@ -110 +110 @@
 #include "libmondo-devices-EXT.h"
 #include "libmondo-tools-EXT.h"
+#include "lib-common-externs.h"
 
 /*@unused@*/
@@ -757 +758 @@
                     orig_cksum);
             log_msg(2, tmp);
-            sprintf(tmp, _("%s has changed on live filesystem"),
+            sprintf(tmp, "%s has changed on live filesystem",
                     biggie_fname);
             log_to_screen(tmp);
@@ -810 +811 @@
     sprintf(curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
             bkpinfo->tmpdir);
-    log_to_screen(_("Verifying regular archives on tape"));
+    log_to_screen("Verifying regular archives on tape");
     total_afioballs = get_last_filelist_number(bkpinfo) + 1;
-    open_progress_form(_("Verifying filesystem"),
-                       _("I am verifying archives against your live filesystem now."),
-                       _("Please wait. This may take a couple of hours."), "",
+    open_progress_form("Verifying filesystem",
+                       "I am verifying archives against your live filesystem now.",
+                       "Please wait. This may take a couple of hours.", "",
                        total_afioballs);
     res = read_header_block_from_stream(&size, fname, &ctrl_chr);
@@ -853 +854 @@
         res = verify_an_afioball_from_stream(bkpinfo, fname, size);
         if (res) {
-            sprintf(tmp, _("Afioball %ld differs from live filesystem"),
+            sprintf(tmp, "Afioball %ld differs from live filesystem",
                     current_afioball_number);
             log_to_screen(tmp);
@@ -937 +938 @@
     noof_biggiefiles = (long) size;
     log_msg(1, "noof_biggiefiles = %ld", noof_biggiefiles);
-    open_progress_form(_("Verifying big files"), comment,
-                       _("Please wait. This may take some time."), "",
+    open_progress_form("Verifying big files", comment,
+                       "Please wait. This may take some time.", "",
                        noof_biggiefiles);
     for (res = read_header_block_from_stream(&size, orig_fname, &ctrl_chr);
@@ -954 +955 @@
             p++;
         }
-        sprintf(comment, _("Verifying bigfile #%ld (%ld K)"),
+        sprintf(comment, "Verifying bigfile #%ld (%ld K)",
                 current_biggiefile_number, (long) size >> 10);
         update_progress_form(comment);
@@ -1019 +1020 @@
 
     sprintf(mountpoint, "%s/cdrom", bkpinfo->tmpdir);
-    sprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->isodir, bkpinfo->nfs_remote_dir,
-            bkpinfo->prefix, g_current_media_number);
+    sprintf(fname, "%s/%s/%s-%d.iso", bkpinfo->nfs_remote_dir,
+            bkpinfo->isodir, bkpinfo->prefix, g_current_media_number);
 
     mkdir(mountpoint, 1777);
@@ -1030 +1031 @@
         log_msg(2, tmp);
         if (bkpinfo->manual_cd_tray) {
-            popup_and_OK(_("Please push CD tray closed."));
+            popup_and_OK("Please push CD tray closed.");
         }
         if (find_and_mount_actual_cd(bkpinfo, mountpoint)) {
-            log_to_screen(_("failed to mount actual CD"));
+            log_to_screen("failed to mount actual CD");
             return (1);
         }
@@ -1043 +1044 @@
         mddevice = make_vn(fname);
         if (ret) {
-            sprintf(tmp, _("make_vn of %s failed; unable to verify ISO\n"),
+            sprintf(tmp, "make_vn of %s failed; unable to verify ISO\n",
                     fname);
             log_to_screen(tmp);
@@ -1054 +1055 @@
 #endif
         if (run_program_and_log_output(command, FALSE)) {
-            sprintf(tmp, _("%s failed; unable to mount ISO image\n"),
+            sprintf(tmp, "%s failed; unable to mount ISO image\n",
                     command);
             log_to_screen(tmp);
@@ -1132 +1133 @@
 
     log_msg(3, "verify_tape_backups --- starting");
-    log_to_screen(_("Verifying backups"));
+    log_to_screen("Verifying backups");
     openin_tape(bkpinfo);
 /* verify archives themselves */
@@ -1157 +1158 @@
             && length_of_file(changed_files_fname) > 2) {
             log_to_screen
-                (_("Warning - unable to check logfile to derive list of changed files"));
+                ("Warning - unable to check logfile to derive list of changed files");
         } else {
             log_to_screen
-                (_("No differences found. Therefore, no 'changed.files' text file."));
+                ("No differences found. Therefore, no 'changed.files' text file.");
         }
     }
@@ -1176 +1177 @@
         log_msg(0, tmp);
         log_to_screen
-            (_("See /tmp/changed.files for a list of nonmatching files."));
+            ("See /tmp/changed.files for a list of nonmatching files.");
         log_to_screen
-            (_("The files probably changed on filesystem, not on backup media."));
+            ("The files probably changed on filesystem, not on backup media.");
         //      retval++;
     }