Changeset 1091 in MondoRescue

Timestamp:

Feb 3, 2007, 11:25:38 AM (17 years ago)

Author:

Bruno Cornec

Message:

mr_fclose improved + fixes for libmondo-archive.c

Location:

branches/stable/mondo/src

Files:

• common/libmondo-archive.c (modified) (5 diffs)
• lib/mr_file.c (modified) (1 diff)

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

@@ -536 +536 @@
     /*@ buffer ************************************************************ */
     char *tmp;
-    char *tmp1 = NULL;
     char *scratchdir;
     char *command;
     char *bootldr_str;
-    char *tape_device;
     char *last_filelist_number;
     char *tape_size_sz;
@@ -558 +556 @@
 
     FILE *fd = NULL;
+    FILE *fd1 = NULL;
 
     assert(bkpinfo != NULL);
@@ -840 +839 @@
             bkpinfo->tmpdir,        // parameter #2
             bkpinfo->scratchdir,    // parameter #3
+            );
             //bkpinfo->kernel_path, // parameter #4
             //tape_device,          // parameter #5
@@ -857 +857 @@
             //bkpinfo->differential,    // parameter #19 (INT)
             //use_gzip_sz);         // parameter #20 (STRING)
-            );
 
     log_msg(2, command);
@@ -906 +905 @@
     mr_free(bootldr_str);
     mr_free(last_filelist_number);
-    mr_free(cd_recovery_sz);
     mr_free(tape_size_sz);
     mr_free(devs_to_exclude);

branches/stable/mondo/src/lib/mr_file.c

@@ -45 +45 @@
         mr_log_exit(-1,"fd is NULL.\nShould NOT happen.\nExiting");
     }
-    (void)fclose(fd);
+    if (fclose(fd) < 0) {
+        mr_msg(0,"Unable to close fd");
+    }
     fd = NULL;
 }