Changeset 1081 in MondoRescue for trunk/mondo/src/common/libmondo-filelist.c

Timestamp:

Jan 28, 2007, 11:20:07 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r1078:1080 $SVN_M/branches/stable

File:

• trunk/mondo/src/common/libmondo-filelist.c (modified) (4 diffs)

trunk/mondo/src/common/libmondo-filelist.c

@@ -455 +455 @@
         mr_asprintf(&strtmp, syscall_sprintf, mr_stresc(file_to_analyze, "`$\\\"", '\\'));
         mr_asprintf(&syscall, "%s 2>> /dev/null", strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         call_exe_and_pipe_output_to_fd(syscall, pout);
         mr_free(syscall);
@@ -766 +766 @@
     }
     // 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
     {
@@ -796 +792 @@
     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;
@@ -858 +850 @@
     }
     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';