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

Timestamp:

Feb 14, 2007, 1:13:49 PM (17 years ago)

Author:

Bruno Cornec

Message:

Update trunk with the latest feedback from stable (obtained with meld) - First pass

File:

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

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

@@ -19 +19 @@
 #include "mr_str.h"
 #include "mr_mem.h"
+#include "mr_msg.h"
 
 #include <time.h>
@@ -332 +333 @@
        then update_progress_form() won't show the "time taken / time remaining"
        line. The bug only crops up AFTER the call to chop_filelist(). Weird. */
-#ifndef _XWIN
     if (!g_text_mode) {
         open_progress_form("", "", "", "", 100);
@@ -339 +339 @@
         newtPopWindow();
     }
-#endif
     return (curr_set_no + 1);
 }
@@ -386 +385 @@
     }
     filelist->ch = '\0';
-    mr_free((void *)filelist);
+    mr_free(filelist);
     depth--;
     if (depth == 0) {
@@ -490 +489 @@
 {
     char *command = NULL;
-    char *tmp = NULL;
     int retval = 0;
 
@@ -542 +540 @@
     mr_asprintf(&masklist, "/tmp/%d.%d.mask", (int) (random() % 32768),
              (int) (random() % 32768));
+
     mr_asprintf(&command, "cp -f %s %s", orig_msklist, masklist);
     run_program_and_log_output(command, 1);
@@ -752 +751 @@
         return (add_string_at_node(node->right, string_to_add));
     }
+
     // walk down tree if appropriate
     if (node->down != NULL && node->ch == char_to_add) {
@@ -765 +765 @@
         return (1);
     }
+
     // add here
     newnode = (struct s_node *) mr_malloc(sizeof(struct s_node));
@@ -1216 +1217 @@
 long g_skeleton_entries = 0;
 
-
 /**
  * Wrapper around mondo_makefilelist().
@@ -1234 +1234 @@
     /*@ int **************************************************** */
     int res = 0;
-    /*@ buffers ************************************************ */
 
     assert(bkpinfo != NULL);
@@ -1343 +1342 @@
         system(strtmp);
         mr_free(strtmp);
-        mr_free(tmp);
-
         mr_asprintf(&tmp, "wc -l %s | awk '{print $1;}'", skeleton_filelist);
         tmp1 = call_program_and_get_last_line_of_output(tmp);
@@ -1522 +1519 @@
     char *tmp1 = NULL;
     char *tmp2 = NULL;
-    char *sz_datefile;
+    char *sz_datefile = NULL;
     char *sz_filelist = NULL;
     char *exclude_paths = NULL;
@@ -1734 +1731 @@
     size_t len = 0;             // Scrub's patch doesn't work without that
 
-//  mr_msg(1, "use_star = %s", (use_star)?"TRUE":"FALSE");
     mr_msg(5, "starting");
     mr_msg(5, "needles_list_fname = %s", needles_list_fname);