Changeset 1080 in MondoRescue for branches/stable/mondo/src/common/libmondo-fork.c

Timestamp:

Jan 28, 2007, 7:04:41 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix mindi install messages (reported by Andree Leidenfrost)
• remove paranoid_free/free for mr_free
• mr_asprintf used everywhere
• mr_malloc used everywhere

File:

• branches/stable/mondo/src/common/libmondo-fork.c (modified) (9 diffs)

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

@@ -5 +5 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "libmondo-fork.h"
@@ -106 +107 @@
     assert_string_is_neither_NULL_nor_zerolength(isofile);
     assert_string_is_neither_NULL_nor_zerolength(logstub);
-    if (!(midway_call = malloc(1200))) {
-        fatal_error("Cannot malloc midway_call");
-    }
-    if (!(ultimate_call = malloc(1200))) {
-        fatal_error("Cannot malloc ultimate_call");
-    }
-    if (!(tmp = malloc(1200))) {
-        fatal_error("Cannot malloc tmp");
-    }
-    if (!(command = malloc(1200))) {
-        fatal_error("Cannot malloc command");
-    }
+    midway_call = mr_malloc(1200);
+    ultimate_call = mr_malloc(1200);
+    tmp = mr_malloc(1200);
+    command = mr_malloc(1200);
     malloc_string(incoming);
     malloc_string(old_stderr);
@@ -178 +171 @@
     }
 
-    paranoid_free(midway_call);
-    paranoid_free(ultimate_call);
-    paranoid_free(tmp);
-    paranoid_free(command);
-    paranoid_free(incoming);
-    paranoid_free(old_stderr);
-    paranoid_free(cd_number_str);
+    mr_free(midway_call);
+    mr_free(ultimate_call);
+    mr_free(tmp);
+    mr_free(command);
+    mr_free(incoming);
+    mr_free(old_stderr);
+    mr_free(cd_number_str);
 /*
   if (bkpinfo->backup_media_type == dvd && !bkpinfo->please_dont_eject_when_restoring)
@@ -424 +417 @@
     tmp[0] = '\0';
     bufcap = 256L * 1024L;
-    if (!(buf = malloc(bufcap))) {
-        fatal_error("Failed to malloc() buf");
-    }
+    buf = mr_malloc(bufcap);
 
     if (direction == 'w') {
@@ -529 +520 @@
     }
 
-    paranoid_free(buf);
-    paranoid_free(tmp);
+    mr_free(buf);
+    mr_free(tmp);
     log_msg(3, "Successfully copied %ld bytes", bytes_written_out);
     return (retval);
@@ -559 +550 @@
     sprintf(command, "ntfsclone --force --save-image --overwrite %s %s", output_fname, input_device);
     res = run_program_and_log_output(command, 5);
-    paranoid_free(command);
+    mr_free(command);
     unlink(output_fname);
     return (res);
@@ -627 +618 @@
     }
     unlink(tempfile);
-    paranoid_free(command);
-    paranoid_free(tempfile);
-    paranoid_free(title);
+    mr_free(command);
+    mr_free(tempfile);
+    mr_free(title);
     return (res);
 }
@@ -721 +712 @@
     }
     log_msg(3, "Parent res = %d", res);
-    paranoid_free(command);
-    paranoid_free(title);
+    mr_free(command);
+    mr_free(title);
     return (res);
 }
@@ -747 +738 @@
     sprintf(command, "ntfsclone --force --restore-image --overwrite %s %s", output_device, input_fifo);
     res = run_program_and_log_output(command, 5);
-    paranoid_free(command);
+    mr_free(command);
     return (res);
 }