Changeset 2241 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-filelist.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-filelist.c (modified) (4 diffs)

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

@@ -17 +17 @@
 #include "libmondo-gui-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "mr_string.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 
 #include <time.h>
@@ -1383 +1383 @@
     if (p) {
         if (!strcmp(p, "/.") || !strcmp(p, "/..")) {
+            mr_free(dir);
             return (0);
         }
@@ -1396 +1397 @@
           mr_asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
           paranoid_free(strtmp);
-          paranoid_free(token);
+          mr_free(token);
         }
 #if linux
@@ -1517 +1518 @@
     paranoid_free(new_with_spaces);
     paranoid_free(skip_these);
-    paranoid_free(dir);
+    mr_free(dir);
 
     if (dip) {