Changeset 1080 in MondoRescue for branches/stable/mondo/src/common/libmondo-verify.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-verify.c (modified) (14 diffs)

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

@@ -9 +9 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "libmondo-verify.h"
@@ -59 +60 @@
     long afio_diffs = 0;
 
-    command = malloc(2000);
-    afio_found_changes = malloc(500);
+    command = mr_malloc(2000);
+    afio_found_changes = mr_malloc(500);
     assert_string_is_neither_NULL_nor_zerolength(changedfiles_fname);
     assert_string_is_neither_NULL_nor_zerolength(ignorefiles_fname);
@@ -100 +101 @@
     log_msg(2, command);
     paranoid_system(command);
-    paranoid_free(command);
-    paranoid_free(afio_found_changes);
+    mr_free(command);
+    mr_free(afio_found_changes);
     return (afio_diffs);
 }
@@ -179 +180 @@
     g_last_afioball_number = set_number - 1;
     close_evalcall_form();
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (retval);
 }
@@ -229 +230 @@
     malloc_string(sz_exe);
     if (!bufblkA) {
-        if (!(bufblkA = malloc(maxbufsize))) {
-            fatal_error("Cannot malloc bufblkA");
-        }
+        bufblkA = mr_malloc(maxbufsize);
     }
     if (!bufblkB) {
-        if (!(bufblkB = malloc(maxbufsize))) {
-            fatal_error("Cannot malloc bufblkB");
-        }
+        bufblkB = mr_malloc(maxbufsize);
     }
 
@@ -369 +366 @@
     close_evalcall_form();
     if (bufblkA) {
-        paranoid_free(bufblkA);
+        mr_free(bufblkA);
     }
     if (bufblkB) {
-        paranoid_free(bufblkB);
-    }
-    paranoid_free(tmp);
-    paranoid_free(command);
-    paranoid_free(sz_exe);
-    paranoid_free(mountpoint);
+        mr_free(bufblkB);
+    }
+    mr_free(tmp);
+    mr_free(command);
+    mr_free(sz_exe);
+    mr_free(mountpoint);
     return (0);
 }
@@ -413 +410 @@
 
 
-    command = malloc(2000);
+    command = mr_malloc(2000);
     malloc_string(outlog);
     malloc_string(tmp);
@@ -506 +503 @@
     //  paranoid_system (tmp);
     //  unlink ("/tmp/mondo-verify.err");
-    paranoid_free(command);
-    paranoid_free(outlog);
-    paranoid_free(tmp);
+    mr_free(command);
+    mr_free(outlog);
+    mr_free(tmp);
     return (0);
 }
@@ -596 +593 @@
     }
     unlink(tarball_fname);
-    paranoid_free(tmp);
-    paranoid_free(tarball_fname);
+    mr_free(tmp);
+    mr_free(tarball_fname);
     return (retval);
 }
@@ -688 +685 @@
         }
     }
-    paranoid_free(test_file);
-    paranoid_free(biggie_cksum);
-    paranoid_free(orig_cksum);
-    paranoid_free(tmp);
-    paranoid_free(slice_fnam);
+    mr_free(test_file);
+    mr_free(biggie_cksum);
+    mr_free(orig_cksum);
+    mr_free(tmp);
+    mr_free(slice_fnam);
     return (retval);
 }
@@ -798 +795 @@
     log_msg(1, "All done with afioballs");
     close_progress_form();
-    paranoid_free(tmp);
-    paranoid_free(fname);
-    paranoid_free(curr_xattr_list_fname);
-    paranoid_free(curr_acl_list_fname);
+    mr_free(tmp);
+    mr_free(fname);
+    mr_free(curr_xattr_list_fname);
+    mr_free(curr_acl_list_fname);
     return (retval);
 }
@@ -900 +897 @@
     }
     close_progress_form();
-    paranoid_free(orig_fname);
-    paranoid_free(logical_fname);
-    paranoid_free(curr_xattr_list_fname);
-    paranoid_free(curr_acl_list_fname);
-    paranoid_free(comment);
-    paranoid_free(tmp);
+    mr_free(orig_fname);
+    mr_free(logical_fname);
+    mr_free(curr_xattr_list_fname);
+    mr_free(curr_acl_list_fname);
+    mr_free(comment);
+    mr_free(tmp);
     return (retval);
 }
@@ -946 +943 @@
 #endif
 
-    command = malloc(2000);
+    command = mr_malloc(2000);
     malloc_string(mountpoint);
     malloc_string(tmp);
@@ -1037 +1034 @@
         }
     }
-    paranoid_free(command);
-    paranoid_free(mountpoint);
-    paranoid_free(tmp);
-    paranoid_free(fname);
+    mr_free(command);
+    mr_free(mountpoint);
+    mr_free(tmp);
+    mr_free(fname);
     return (retval);
 }