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

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

@@ -8 +8 @@
 
 #include "my-stuff.h"
+#include "mr_mem.h"
 #include "mondostructures.h"
 #include "libmondo-string.h"
@@ -220 +221 @@
     malloc_string(tmp);
     if (!incoming[0]) {
-        free(tmp);
+        mr_free(tmp);
         return (0);
     }
@@ -254 +255 @@
         fatal_error(tmp);
     }
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (outval);
 }
@@ -512 +513 @@
     char *p;
 
-    input = malloc(2000);
+    input = mr_malloc(2000);
     assert_string_is_neither_NULL_nor_zerolength(ip);
     assert_string_is_neither_NULL_nor_zerolength(token);
@@ -526 +527 @@
         strcat(output, p);
     }
-    paranoid_free(input);
+    mr_free(input);
 }
 
@@ -796 +797 @@
     }
     in_out[i] = '\0';
-    paranoid_free(tmp);
+    mr_free(tmp);
 /*  for(i=strlen(in_out); i>0 && in_out[i-1]<=32; i--) {in_out[i-1]='\0';} */
 }
@@ -1018 +1019 @@
         strcpy(out_reason, reason);
     }
-    paranoid_free(filename);
-    paranoid_free(reason);
+    mr_free(filename);
+    mr_free(reason);
     return (sev);
 }
@@ -1112 +1113 @@
     j = (int) strlen(outstr);
     sprintf(outstr + j, "] %d%% used", percentage);
-    paranoid_free(pos_w_commas);
-    paranoid_free(tmp);
+    mr_free(pos_w_commas);
+    mr_free(tmp);
     return (outstr);
 }