Changeset 541 in MondoRescue for branches/stable/mondo/mondo/common/libmondo-stream.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-stream.c (modified) (15 diffs)

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

@@ -100 +100 @@
 #include "mondostructures.h"
 #include "libmondo-devices.h"
+#include "lib-common-externs.h"
 #include "libmondo-stream.h"
 #include "libmondo-string-EXT.h"
 #include "libmondo-files-EXT.h"
-#include "newt-specific-EXT.h"
+#include "libmondo-gui-EXT.h"
 #include "libmondo-fork-EXT.h"
 #include "libmondo-tools-EXT.h"
@@ -518 +519 @@
         //      log_it("g_current_media_number = %d", g_current_media_number);
         sprintf(tmp,
-                _("When the tape drive goes quiet, please insert volume %d in this series."),
+                "When the tape drive goes quiet, please insert volume %d in this series.",
                 tapeno);
         popup_and_OK(tmp);
-        open_evalcall_form(_("Waiting while the tape drive settles"));
-    } else {
-        open_evalcall_form(_("Waiting while the tape drive rewinds"));
+        open_evalcall_form("Waiting while the tape drive settles");
+    } else {
+        open_evalcall_form("Waiting while the tape drive rewinds");
     }
 
@@ -730 +731 @@
                                 bkpinfo->internal_tape_block_size))) {
         log_OS_error(g_tape_fifo);
-        log_to_screen(_("Cannot openin stream device"));
+        log_to_screen("Cannot openin stream device");
         return (1);
     }
-    log_to_screen(_("Reading stream"));
+    log_to_screen("Reading stream");
     log_it("stream device = '%s'", bkpinfo->media_device);
 /* skip data disks */
     open_evalcall_form("Skipping data disks on stream");
-    log_to_screen(_("Skipping data disks on stream"));
+    log_to_screen("Skipping data disks on stream");
     if (!(fout = fopen(outfname, "w"))) {
         log_OS_error(outfname);
-        log_to_screen(_("Cannot openout datadisk all.tar.gz file"));
+        log_to_screen("Cannot openout datadisk all.tar.gz file");
         return (-1);
     }
     if (!(datablock = (char *) malloc(256 * 1024))) {
-        log_to_screen(_("Unable to malloc 256*1024"));
+        log_to_screen("Unable to malloc 256*1024");
         exit(1);
     }
@@ -821 +822 @@
         return (0);
     } else {
-        log_to_screen(_("Failed to openout to cdstream (fifo)"));
+        log_to_screen("Failed to openout to cdstream (fifo)");
         return (1);
     }
@@ -854 +855 @@
          open_device_via_buffer(tapedev, 'w', internal_tape_block_size))) {
         log_OS_error(g_tape_fifo);
-        log_to_screen(_("Cannot openin stream device"));
+        log_to_screen("Cannot openin stream device");
         return (1);
     }
@@ -997 +998 @@
     if (!fout) {
         log_OS_error(outfname);
-        log_to_screen(_("Cannot openout file"));
+        log_to_screen("Cannot openout file");
         return (1);
     }
@@ -1055 +1056 @@
     }
     if (strcmp(temp_cksum, actual_cksum)) {
-        sprintf(tmp, _("actual cksum=%s; recorded cksum=%s"), actual_cksum,
+        sprintf(tmp, "actual cksum=%s; recorded cksum=%s", actual_cksum,
                 temp_cksum);
         log_to_screen(tmp);
-        sprintf(tmp, _("%s (%ld K) is corrupt on tape"), temp_fname,
+        sprintf(tmp, "%s (%ld K) is corrupt on tape", temp_fname,
                 (long) orig_size >> 10);
         log_to_screen(tmp);
@@ -1210 +1211 @@
         log_it("mediasize = %ld", mediasize);
         we_need_a_new_tape = TRUE;
-        log_to_screen(_("Should have started a new tape/CD already"));
+        log_to_screen("Should have started a new tape/CD already");
     }
     if ((g_tape_posK + length_of_incoming_file / 1024) >> 10 >=
@@ -1367 +1368 @@
                                 bkpinfo->internal_tape_block_size))) {
         log_OS_error(g_tape_fifo);
-        log_to_screen(_("Cannot openin stream device"));
+        log_to_screen("Cannot openin stream device");
         return (1);
     }
@@ -1405 +1406 @@
     if (g_current_media_number > MAX_NOOF_MEDIA) {
         res++;
-        log_to_screen(_("Too many tapes. Man, you need to use nfs!"));
+        log_to_screen("Too many tapes. Man, you need to use nfs!");
     }
     if (bkpinfo->backup_media_type == cdstream) {
@@ -1417 +1418 @@
         g_tape_stream = popen(command, "w");
         if (!g_tape_stream) {
-            log_to_screen(_("Failed to openout to cdstream (fifo)"));
+            log_to_screen("Failed to openout to cdstream (fifo)");
             return (1);
         }
@@ -1427 +1428 @@
                                     bkpinfo->internal_tape_block_size))) {
             log_OS_error(g_tape_fifo);
-            log_to_screen(_("Cannot openin stream device"));
+            log_to_screen("Cannot openin stream device");
             return (1);
         }
@@ -1512 +1513 @@
     /*@ end vars *************************************************** */
 
-    open_evalcall_form(_("Writing data disks to tape"));
-    log_to_screen(_("Writing data disks to tape"));
+    open_evalcall_form("Writing data disks to tape");
+    log_to_screen("Writing data disks to tape");
     log_it("Data disks = %s", fname);
     if (!does_file_exist(fname)) {
-        sprintf(tmp, _("Cannot find %s"), fname);
+        sprintf(tmp, "Cannot find %s", fname);
         log_to_screen(tmp);
         return (1);
@@ -1705 +1706 @@
     if (!g_tape_stream) {
         log_to_screen
-            (_("You're not backing up to tape. Why write a tape header?"));
+            ("You're not backing up to tape. Why write a tape header?");
         return (1);
     }
@@ -1750 +1751 @@
 
     /*@ end vars *************************************************** */
-    sprintf(tmp, _("Wrong marker! (Should be %s, "),
+    sprintf(tmp, "Wrong marker! (Should be %s, ",
             marker_to_string(should_be));
-    sprintf(tmp + strlen(tmp), _("is actually %s)"), marker_to_string(it_is));
+    sprintf(tmp + strlen(tmp), "is actually %s)", marker_to_string(it_is));
     log_to_screen(tmp);
 }