Changeset 2241 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-raid.c

Timestamp:

Jun 29, 2009, 7:19:14 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3144@localhost: bruno | 2009-06-26 12:18:08 +0200

• Remove mr_string.c|.h useless and in de=uplication with mr_str.c|.h
• Solve with valgrind's help some memroy leak (harmless mostly)
• Solve a seg fault at end, when unallocating a bkpinfo member after the strcuture disallocation !
• after mr_strtok, memory ssociated with the token needs to be free
• Adds a new function free_newt_stuff to free newt related allocated memory
• Do not exit if mr_free is unsuccessful, and only warn when debug > 8

File:

• branches/2.2.9/mondo/src/common/libmondo-raid.c (modified) (5 diffs)

branches/2.2.9/mondo/src/common/libmondo-raid.c

@@ -17 +17 @@
 #include "lib-common-externs.h"
 #include "libmondo-raid.h"
-#include "mr_string.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 
 #ifdef __FreeBSD__
@@ -1037 +1037 @@
     strcpy(raidlist->el[raidlist->entries].raid_device, strtmp);
     paranoid_free(strtmp);
-    paranoid_free(token);
+    mr_free(token);
     // skip ':' and status
     token = mr_strtok (string, delims, &lastpos);
-    paranoid_free(token);
+    mr_free(token);
     token = mr_strtok (string, delims, &lastpos);
     if (!strcmp(token, "inactive")) {
@@ -1046 +1046 @@
          raidlist->el[raidlist->entries].raid_device);
       paranoid_free(string);
-      paranoid_free(token);
+      mr_free(token);
       return 1;
     }
-    paranoid_free(token);
+    mr_free(token);
 
     // get RAID level
@@ -1075 +1075 @@
       return 1;
     }
-    paranoid_free(token);
+    mr_free(token);
 
     // get RAID devices (type, index, device)
@@ -1120 +1120 @@
         break;
       }
-      paranoid_free(token);
+      mr_free(token);
     }