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

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

@@ -1 @@
-/* libmondo-mountlist.c                            subroutines for handling mountlist
+/* subroutines for handling mountlist
    $Id$
 */
@@ -18 +18 @@
 #include "libmondo-string-EXT.h"
 #include "libmondo-gui-EXT.h"
+#include "mr_mem.h"
 
 /*@unused@*/
@@ -488 +489 @@
 
   endoffunc:
-    paranoid_free(tmp);
-    paranoid_free(device);
-    paranoid_free(mountpoint);
+    mr_free(tmp);
+    mr_free(device);
+    mr_free(mountpoint);
 
     if (res) {
@@ -528 +529 @@
     /*@ initialize ******************************************************* */
 
-    drivelist = malloc(sizeof(struct list_of_disks));
+    drivelist = mr_malloc(sizeof(struct list_of_disks));
     malloc_string(tmp);
     malloc_string(flaws_str);
@@ -591 +592 @@
          && strcmp(mountlist->el[i].device, device) != 0; i++);
 
-    paranoid_free(tmp);
-    paranoid_free(flaws_str);
+    mr_free(tmp);
+    mr_free(flaws_str);
 
     if (i == mountlist->entries) {
@@ -651 +652 @@
         }
     }
-    paranoid_free(curr_mountpoint);
-    paranoid_free(tmp);
+    mr_free(curr_mountpoint);
+    mr_free(tmp);
     return (res);
 }
@@ -702 +703 @@
         }
     }
-    paranoid_free(tmp);
-    paranoid_free(format_sz);
+    mr_free(tmp);
+    mr_free(format_sz);
     return (res);
 }
@@ -783 +784 @@
     drivelist->entries = noof_drives;
     log_msg(8, "Made list of drives");
-    paranoid_free(drive);
-    paranoid_free(tmp);
+    mr_free(drive);
+    mr_free(tmp);
 
     return (noof_drives);
@@ -844 +845 @@
     output_list->entries = items;
     log_it("MLUORP -- ending");
-    paranoid_free(tmp);
+    mr_free(tmp);
 }
 
@@ -911 +912 @@
         log_it("Unable to open mountlist - '%s'", fname);
         log_to_screen("Cannot open mountlist");
-        paranoid_free(incoming);
-        paranoid_free(siz);
-        paranoid_free(tmp);
+        mr_free(incoming);
+        mr_free(siz);
+        mr_free(tmp);
         return (1);
     }
@@ -999 +1000 @@
     sprintf(tmp, "%d entries in mountlist", items);
     log_it(tmp);
-    paranoid_free(incoming);
-    paranoid_free(siz);
-    paranoid_free(tmp);
+    mr_free(incoming);
+    mr_free(siz);
+    mr_free(tmp);
     return (0);
 }