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

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

@@ -18 +18 @@
 #include "libmondo-tools-EXT.h"
 #include "mr_str.h"
+#include "mr_mem.h"
 
 #include <time.h>
@@ -148 +149 @@
 
   end_of_func:
-    paranoid_free(filelist);
-    paranoid_free(tempfile);
-    paranoid_free(cksumlist);
-    paranoid_free(dev);
-    paranoid_free(tmp);
+    mr_free(filelist);
+    mr_free(tempfile);
+    mr_free(cksumlist);
+    mr_free(dev);
+    mr_free(tmp);
     return (retval);
 }
@@ -191 +192 @@
         }
     }
-    paranoid_free(tmp_fname);
-    paranoid_free(command);
+    mr_free(tmp_fname);
+    mr_free(command);
     log_msg(1, "Finished sorting file %s", orig_fname);
     return (retval);
@@ -243 +244 @@
     malloc_string(outfname);
     malloc_string(biggie_fname);
-    incoming = malloc(MAX_STR_LEN * 2);
+    incoming = mr_malloc(MAX_STR_LEN * 2);
     malloc_string(tmp);
     malloc_string(acl_fname);
@@ -364 +365 @@
 #endif
   end_of_func:
-    paranoid_free(outfname);
-    paranoid_free(biggie_fname);
-    paranoid_free(incoming);
-    paranoid_free(tmp);
-    paranoid_free(acl_fname);
-    paranoid_free(xattr_fname);
+    mr_free(outfname);
+    mr_free(biggie_fname);
+    mr_free(incoming);
+    mr_free(tmp);
+    mr_free(acl_fname);
+    mr_free(xattr_fname);
     return (err ? 0 : curr_set_no + 1);
 }
@@ -419 +420 @@
     }
     filelist->ch = '\0';
-    paranoid_free(filelist);
+    mr_free(filelist);
     depth--;
     if (depth == 0) {
@@ -448 +449 @@
     }
     paranoid_pclose(pattr);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (0);
 }
@@ -474 +475 @@
         log_msg(1, "Cannot openout auxlist_fname %s", auxlist_fname);
         fclose(fin);
-        paranoid_free(pout_command);
+        mr_free(pout_command);
         return (4);
     }
@@ -487 +488 @@
         asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\'));
         asprintf(&syscall, "%s 2>> /dev/null", strtmp); // " MONDO_LOGFILE);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         call_exe_and_pipe_output_to_fd(syscall, pout);
-        paranoid_free(syscall);
+        mr_free(syscall);
     }
     paranoid_fclose(fin);
     paranoid_pclose(pout);
-    paranoid_free(file_to_analyze);
-    paranoid_free(pout_command);
+    mr_free(file_to_analyze);
+    mr_free(pout_command);
     return (0);
 }
@@ -514 +515 @@
         iamhere(command);
         retval = system(command);
-        paranoid_free(command);
+        mr_free(command);
     }
     return (retval);
@@ -529 +530 @@
         sprintf(command, "touch %s", fattr_fname);
         run_program_and_log_output(command, 8);
-        paranoid_free(command);
+        mr_free(command);
 //      sort_file(filelist); // FIXME - filelist chopper sorts, so this isn't necessary
         retval =
@@ -561 +562 @@
         log_msg(1, "command = %s", command);
         retval = system(command);
-        paranoid_free(command);
+        mr_free(command);
         log_msg(1, "Returning w/ retval=%d", retval);
         return (retval);
@@ -569 +570 @@
                 "original_exat_fname %s is empty or missing, so no need to set EXAT list",
                 original_exat_fname);
-        paranoid_free(command);
+        mr_free(command);
         return (0);
     }
@@ -679 +680 @@
 
     unlink(masklist);
-    paranoid_free(current_subset_file);
-    paranoid_free(current_master_file);
-    paranoid_free(syscall_pout);
-    paranoid_free(syscall_pin);
-    paranoid_free(masklist);
-    paranoid_free(incoming);
-    paranoid_free(command);
+    mr_free(current_subset_file);
+    mr_free(current_master_file);
+    mr_free(syscall_pout);
+    mr_free(syscall_pin);
+    mr_free(masklist);
+    mr_free(incoming);
+    mr_free(command);
     return (retval);
 }
@@ -805 +806 @@
 
 /* add here */
-    if (!(newnode = (struct s_node *) malloc(sizeof(struct s_node)))) {
-        log_to_screen("failed to malloc");
-        depth--;
-        return (1);
-    }
+    newnode = (struct s_node *) mr_malloc(sizeof(struct s_node));
     if (char_to_add < node->ch) // add to the left of node
     {
@@ -835 +832 @@
     log_msg(6, "Adding remaining chars ('%s')", string_to_add + 1);
     for (i = 1; i < noof_chars; i++) {
-        if (!
-            (node->down =
-             (struct s_node *) malloc(sizeof(struct s_node)))) {
-            log_to_screen("%s - failed to malloc", string_to_add);
-            return (1);
+            node->down = (struct s_node *) mr_malloc(sizeof(struct s_node));
         }
         node = node->down;
@@ -901 +894 @@
     }
     g_original_noof_lines_in_filelist = lines_in_filelist;
-    if (!(filelist = (struct s_node *) malloc(sizeof(struct s_node)))) {
-        return (NULL);
-    }
+    filelist = (struct s_node *) mr_malloc(sizeof(struct s_node));
     filelist->ch = '/';
     filelist->right = NULL;
-    filelist->down = malloc(sizeof(struct s_node));
+    filelist->down = mr_malloc(sizeof(struct s_node));
     filelist->expanded = filelist->selected = FALSE;
     (filelist->down)->ch = '\0';
@@ -1396 +1387 @@
         while((token = mr_strtok (sth, delims, &lastpos))) {
           asprintf(&strtmp,"%s", find_excludes);
-          paranoid_free(find_excludes);
+          mr_free(find_excludes);
           asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
-          paranoid_free(strtmp);
-          paranoid_free(token);
+          mr_free(strtmp);
+          mr_free(token);
         }
 #if linux
@@ -1412 +1403 @@
                 dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #endif
-        paranoid_free(find_excludes);
+        mr_free(find_excludes);
         log_msg(5, "find command = %s", strtmp);
         system(strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         sprintf(tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
         g_skeleton_entries =
@@ -1520 +1511 @@
     if (!depth) {
         close_evalcall_form();
-        paranoid_free(name_of_evalcall_form);
-        paranoid_free(find_skeleton_marker);
+        mr_free(name_of_evalcall_form);
+        mr_free(find_skeleton_marker);
         unlink(g_skeleton_filelist);
         log_msg(5, "g_skeleton_entries = %ld", g_skeleton_entries);
     }
-    paranoid_free(tmp);
-    paranoid_free(sth_B);
-    paranoid_free(ith_B);
-    paranoid_free(new_with_spaces);
+    mr_free(tmp);
+    mr_free(sth_B);
+    mr_free(ith_B);
+    mr_free(new_with_spaces);
     return (0);
 }
@@ -1593 +1584 @@
     malloc_string(sz_filelist);
     malloc_string(g_skeleton_filelist);
-    if (!(exclude_paths = malloc(1000))) {
-        fatal_error("Cannot malloc exclude_paths");
-    }
+    exclude_paths = mr_malloc(1000);
     log_msg(3, "Trying to write test string to exclude_paths");
     strcpy(exclude_paths, "/blah /froo");
@@ -1688 +1677 @@
     paranoid_system(command);
     log_msg(2, "Freeing variables");
-    paranoid_free(sz_filelist);
-    paranoid_free(command);
-    paranoid_free(exclude_paths);
-    paranoid_free(tmp);
-    paranoid_free(g_skeleton_filelist);
+    mr_free(sz_filelist);
+    mr_free(command);
+    mr_free(exclude_paths);
+    mr_free(tmp);
+    mr_free(g_skeleton_filelist);
     log_msg(2, "Exiting");
     return (0);
@@ -1838 +1827 @@
     paranoid_fclose(fout);
     paranoid_fclose(fin);
-    paranoid_free(fname);
-    paranoid_free(tmp);
+    mr_free(fname);
+    mr_free(tmp);
     return (retval);
 }
@@ -1895 +1884 @@
     }
     paranoid_fclose(fin);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (0);
 }