Changeset 1164 in MondoRescue

Timestamp:

Feb 14, 2007, 9:35:00 PM (17 years ago)

Author:

Bruno Cornec

Message:

Compiler warning solved (M. Loiseleur again !)
Code displaced to ease memeory management in case of exit in libmondo-archive.c

Location:

branches/stable/mondo/src

Files:

• common/libmondo-archive.c (modified) (7 diffs)
• common/libmondo-filelist.c (modified) (1 diff)
• common/libmondo-raid-EXT.h (modified) (1 diff)
• include/mr_file.h (modified) (1 diff)
• mondoarchive/mondo-cli-EXT.h (modified) (1 diff)
• mondoarchive/mondo-cli.c (modified) (1 diff)

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

@@ -1234 +1234 @@
 
     /*@ buffers *********************************** */
-    char *command, *tmpfile, *data_disks_file;
+    char *command, *tmp_file, *data_disks_file;
 
     assert(bkpinfo != NULL);
@@ -1250 +1250 @@
     assert(strlen(g_serial_string) < MAX_STR_LEN);
 
-    mr_asprintf(&tmpfile, "%s/archives/SERIAL-STRING", bkpinfo->scratchdir);
-    if (write_one_liner_data_file(tmpfile, g_serial_string)) {
+    mr_asprintf(&tmp_file, "%s/archives/SERIAL-STRING", bkpinfo->scratchdir);
+    if (write_one_liner_data_file(tmp_file, g_serial_string)) {
         mr_msg(1, "%ld: Failed to write serial string", __LINE__);
     }
-    mr_free(tmpfile);
+    mr_free(tmp_file);
 
     mvaddstr_and_log_it(g_currentY, 0, "Preparing to archive your data");
@@ -3203 +3203 @@
     biggiestruct.use_ntfsprog = use_ntfsprog;
     optimal_set_size = bkpinfo->optimal_set_size;
-    if (is_this_file_compressed(biggie_filename)
-        || bkpinfo->compression_level == 0) {
-        mr_asprintf(&suffix, "");
-        //      log_it("%s is indeed compressed :-)", filename);
-        should_I_compress_slices = FALSE;
-    } else {
-        mr_asprintf(&suffix, bkpinfo->zip_suffix);
-        should_I_compress_slices = TRUE;
-    }
 
     if (optimal_set_size < 999) {
@@ -3243 +3234 @@
             log_OS_error("Unable to popen-in command");
             mr_free(command);
-            mr_free(suffix);
             return (1);
         }
@@ -3272 +3262 @@
 
     mr_asprintf(&tmp, slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""));
-    fout = fopen(tmp, "w");
-    if (fout == NULL) {
-        mr_msg(1, "Unable to open and write to %s\n", tmp);
-        mr_free(tmp);
-        mr_free(suffix);
-        return (1);
-    }
+    fout = mr_fopen(tmp, "w");
     mr_free(tmp);
 
     (void) fwrite((void *) &biggiestruct, 1, sizeof(biggiestruct), fout);
-    paranoid_fclose(fout);
+    mr_fclose(fout);
     length = totallength / optimal_set_size / 1024;
     mr_msg(1, "Opening in %s; slicing it and writing to CD/tape",
@@ -3292 +3276 @@
         log_to_screen(tmp);
         mr_free(tmp);
-        mr_free(suffix);
         return (1);
     }
@@ -3305 +3288 @@
                              slice_fname(biggie_file_number, 0,
                                          bkpinfo->tmpdir, ""), NULL);
+    }
+    if (is_this_file_compressed(biggie_filename)
+        || bkpinfo->compression_level == 0) {
+        mr_asprintf(&suffix, "");
+        should_I_compress_slices = FALSE;
+    } else {
+        mr_asprintf(&suffix, bkpinfo->zip_suffix);
+        should_I_compress_slices = TRUE;
     }
     i = bkpinfo->optimal_set_size / 256;

branches/stable/mondo/src/common/libmondo-filelist.c

@@ -686 +686 @@
 {
     /*@ buffers ***************************************************** */
-    char *val_sz;
+    char *val_sz = NULL;
     char *cfg_fname = NULL;
 

branches/stable/mondo/src/common/libmondo-raid-EXT.h

@@ -50 +50 @@
 #else
 extern void add_disk_to_raid_device(struct list_of_disks *disklist,
-                                    char *device_to_add, int index);
+                                    char *device_to_add, int idx);
 #endif
 

branches/stable/mondo/src/include/mr_file.h

@@ -24 +24 @@
 extern FILE *mr_fopen_int(const char *path, const char *mode,int line, char *file);
 extern FILE *mr_fprintf_int(FILE *stream,int line, char *file, const char *fmt, ...);
-extern void mr_fclose_int(FILE *fd, int line, char *file);
+extern void mr_fclose_int(FILE **fd, int line, char *file);
 extern void mr_mkdir_int(const char *pathname, mode_t mode, int line, char *file);
 

branches/stable/mondo/src/mondoarchive/mondo-cli-EXT.h

@@ -11 +11 @@
                                                flag_val[128][MAX_STR_LEN],
                                                bool flag_set[128]);
-extern void help_screen();
+extern void help_screen(void);
 extern void terminate_daemon(int sig);
 extern void set_signals(int on);

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -943 +943 @@
  * Print a not-so-helpful help message and exit.
  */
-void help_screen()
+void help_screen(void)
 {
     mr_msg(1, "Type 'man mondo-archive' for more information\n");