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

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

@@ -10 +10 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "lib-common-externs.h"
@@ -175 +176 @@
 else { print $0;};}' $file.old  > $file ; fi ; done");
     run_program_and_log_output(tmp, 5);
-    paranoid_free(tmp);
+    mr_free(tmp);
 }
 
@@ -724 +725 @@
     chmod(bkpinfo->tmpdir, 0700);
     g_backup_media_type = bkpinfo->backup_media_type;
-    paranoid_free(mtpt);
-    paranoid_free(extra_cdrom_params);
-    paranoid_free(mondo_mkisofs_sz);
-    paranoid_free(command);
-    paranoid_free(hostname);
-    paranoid_free(ip_address);
-    paranoid_free(cdr_exe);
-    paranoid_free(tmp);
-    paranoid_free(iso_dev);
-    paranoid_free(iso_mnt);
-    paranoid_free(iso_tmp);
-    paranoid_free(iso_path);
+    mr_free(mtpt);
+    mr_free(extra_cdrom_params);
+    mr_free(mondo_mkisofs_sz);
+    mr_free(command);
+    mr_free(hostname);
+    mr_free(ip_address);
+    mr_free(cdr_exe);
+    mr_free(tmp);
+    mr_free(iso_dev);
+    mr_free(iso_mnt);
+    mr_free(iso_tmp);
+    mr_free(iso_path);
     return (retval);
 }
@@ -1390 +1391 @@
     }
     depth--;
-    paranoid_free(tmp);
+    mr_free(tmp);
 }
 
@@ -1404 +1405 @@
  * @bug This function seems orphaned. Please remove.
  */
-#define do_alloc_or_free_depending(x,y) { if(y) {x=malloc(MAX_STR_LEN);} else {paranoid_free(x);} }
+#define do_alloc_or_free_depending(x,y) { if(y) {x=mr_malloc(MAX_STR_LEN);} else {mr_free(x);} }
 
 /**
@@ -1422 +1423 @@
     } else {
         iamhere("Freeing globals");
-        paranoid_free(g_boot_mountpt);
-        paranoid_free(g_mondo_home);
-        paranoid_free(g_tmpfs_mountpt);
-        paranoid_free(g_erase_tmpdir_and_scratchdir);
-        paranoid_free(g_serial_string);
-        paranoid_free(g_magicdev_command);
+        mr_free(g_boot_mountpt);
+        mr_free(g_mondo_home);
+        mr_free(g_tmpfs_mountpt);
+        mr_free(g_erase_tmpdir_and_scratchdir);
+        mr_free(g_serial_string);
+        mr_free(g_magicdev_command);
     }
 
@@ -1509 +1510 @@
         paranoid_system(tmp);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
 }