Changeset 2357 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.c

Timestamp:

Aug 29, 2009, 3:22:10 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Some more fgets => mr_getline transformations
• XWIN define is gone

File:

• branches/2.2.10/mondo/src/common/libmondo-archive.c (modified) (8 diffs)

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

@@ -227 +227 @@
         log_msg(5, "command='%s'", command);
         res = system(command);
-        mr_asprintf(tmp, "%s", last_line_of_file(MONDO_LOGFILE));
+        tmp = last_line_of_file(MONDO_LOGFILE);
         log_msg(1, "res=%d; tmp='%s'", res, tmp);
         if (bkpinfo->use_star && (res == 254 || res == 65024)
@@ -558 +558 @@
 
     mr_asprintf(tmp, "%s/LAST-FILELIST-NUMBER", bkpinfo->tmpdir);
-    mr_asprintf(last_filelist_number, "%s", last_line_of_file(tmp));
+    last_filelist_number = last_line_of_file(tmp);
     mr_free(tmp);
 
@@ -2034 +2034 @@
             res = slice_up_file_etc(bigfile_fname, ntfsprog_fifo, biggie_file_number, noof_biggie_files, use_ntfsprog);
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-                write_header_block_to_stream((off_t)0, calc_checksum_of_file(bigfile_fname), BLK_STOP_A_BIGGIE);
+                tmp = calc_checksum_of_file(bigfile_fname);
+                write_header_block_to_stream((off_t)0, tmp, BLK_STOP_A_BIGGIE);
+                mr_free(tmp);
             }
             retval += res;
@@ -2049 +2051 @@
         }
         mr_free(bigfile_fname);
-#ifndef _XWIN
         if (!g_text_mode) {
             newtDrawRootText(0, g_noof_rows - 2, tmp);
             newtRefresh();
         }
-#endif
         mr_free(tmp);
     }
@@ -2654 +2654 @@
             mr_free(mds);
 
-            cd_number = atoi(last_line_of_file(szcdno));
+            tmp = last_line_of_file(szcdno);
+            cd_number = atoi(tmp);
+            mr_free(tmp);
+
             mr_asprintf(tmp, "cat %s 2> /dev/null", szserfname);
             mr_free(our_serial_str);
@@ -2982 +2985 @@
                 mr_asprintf(tmp, "%s - Bigfile #%ld, slice #%ld compressed OK          ", biggie_filename, biggie_file_number + 1, slice_num);
             }
-#ifndef _XWIN
             if (!g_text_mode) {
                 newtDrawRootText(0, g_noof_rows - 2, tmp);
@@ -2989 +2991 @@
                 log_msg(2, tmp);
             }
-#else
-            log_msg(2, tmp);
-#endif
             mr_free(tmp);
 
@@ -3111 +3110 @@
     log_msg(2, tmp);
     center_string(tmp, 80);
-#ifndef _XWIN
     if (!g_text_mode) {
         newtPushHelpLine(tmp);
     }
-#endif
     res = write_iso_and_go_on(TRUE);
-#ifndef _XWIN
     if (!g_text_mode) {
         newtPopHelpLine();
     }
-#endif
     log_msg(2, "Returning from writing final ISO (res=%d)", res);
     paranoid_free(tmp);