Changeset 2405 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c

Timestamp:

Sep 17, 2009, 3:45:24 AM (15 years ago)

Author:

Bruno Cornec

Message:

Removes some malloc_string static allocation

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c (modified) (7 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -43 +43 @@
 
   /** needs malloc *******/
-    char *checksum_ptr = NULL;
-    char *original_cksum_ptr = NULL;
-    char *bigfile_fname_ptr = NULL;
-    char *tmp_ptr = NULL;
-    char *command_ptr = NULL;
-
-    char *checksum, *bigfile_fname, *tmp, *command;
+    char *checksum = NULL;
+    char *original_cksum = NULL;
+    char *bigfile_fname = NULL;
+    char *tmp = NULL;
+    char *command = NULL;
 
     char *p;
@@ -56 +54 @@
 
     struct s_filename_and_lstat_info biggiestruct;
-
-    malloc_string(checksum);
-    malloc_string(bigfile_fname);
-    malloc_string(tmp);
-    malloc_string(command);
 
   /*********************************************************************
@@ -83 +76 @@
     paranoid_fclose(fin);
 
-    mr_asprintf(checksum_ptr, "%s", biggiestruct.checksum);
-    mr_asprintf(bigfile_fname_ptr, "%s", biggiestruct.filename);
+    mr_asprintf(checksum, "%s", biggiestruct.checksum);
+    mr_asprintf(bigfile_fname, "%s", biggiestruct.filename);
 
     log_msg(2, "biggiestruct.filename = %s", biggiestruct.filename);
@@ -90 +83 @@
 
     if (!g_text_mode) {
-        mr_asprintf(tmp_ptr, "Comparing %s", bigfile_fname_ptr);
-        newtDrawRootText(0, 22, tmp_ptr);
-        paranoid_free(tmp_ptr);
+        mr_asprintf(tmp, "Comparing %s", bigfile_fname);
+        newtDrawRootText(0, 22, tmp);
+        paranoid_free(tmp);
         newtRefresh();
     }
     if (!checksum[0]) {
-        log_msg(2, "Warning - %s has no checksum", bigfile_fname_ptr);
-    }
-    if (!strncmp(bigfile_fname_ptr, "/dev/", 5)) {
-        log_msg(2, "IGNORING %s as begining with /dev", bigfile_fname_ptr);
-        mr_free(bigfile_fname_ptr);
+        log_msg(2, "Warning - %s has no checksum", bigfile_fname);
+    }
+    if (!strncmp(bigfile_fname, "/dev/", 5)) {
+        log_msg(2, "IGNORING %s as begining with /dev", bigfile_fname);
+        mr_free(bigfile_fname);
         return (1);
     }
 
-    mr_asprintf(command_ptr, "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors", MNT_RESTORING, bigfile_fname_ptr);
-    log_msg(2, command_ptr);
-    i =  system(command_ptr);
-    mr_free(command_ptr);
-
-    mr_asprintf(tmp_ptr, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
-    paranoid_system(tmp_ptr);
-    paranoid_free(tmp_ptr);
+    mr_asprintf(command, "md5sum \"%s%s\" > /tmp/md5sum.txt 2> /tmp/errors", MNT_RESTORING, bigfile_fname);
+    log_msg(2, command);
+    i =  system(command);
+    mr_free(command);
+
+    mr_asprintf(tmp, "cat /tmp/errors >> %s 2> /dev/null", MONDO_LOGFILE);
+    paranoid_system(tmp);
+    paranoid_free(tmp);
 
     if (i) {
@@ -120 +113 @@
             log_msg(2,
                     "Unable to open /tmp/md5sum.txt; can't get live checksum");
-            mr_free(bigfile_fname_ptr);
+            mr_free(bigfile_fname);
             return (1);
         } else {
-            mr_getline(original_cksum_ptr, fin);
+            mr_getline(original_cksum, fin);
             paranoid_fclose(fin);
-            p = strchr(original_cksum_ptr, ' ');
+            p = strchr(original_cksum, ' ');
             if (p) {
                 *p = '\0';
@@ -131 +124 @@
         }
     }
-    mr_asprintf(tmp_ptr, "bigfile #%ld ('%s') ", bigfileno + 1, bigfile_fname_ptr);
-    if ((original_cksum_ptr != NULL) && (strcmp(checksum_ptr, original_cksum_ptr) == 0)) {
-        mr_strcat(tmp_ptr, " ... OK");
-    } else {
-        mr_strcat(tmp_ptr, "... changed");
+    mr_asprintf(tmp, "bigfile #%ld ('%s') ", bigfileno + 1, bigfile_fname);
+    if ((original_cksum != NULL) && (strcmp(checksum, original_cksum) == 0)) {
+        mr_strcat(tmp, " ... OK");
+    } else {
+        mr_strcat(tmp, "... changed");
         retval++;
     }
-    mr_free(checksum_ptr);
-    mr_free(original_cksum_ptr);
-
-    log_msg(1, tmp_ptr);
-    paranoid_free(tmp_ptr);
+    mr_free(checksum);
+    mr_free(original_cksum);
+
+    log_msg(1, tmp);
+    paranoid_free(tmp);
 
     if (retval) {
@@ -148 +141 @@
             fatal_error("Cannot openout changed.txt");
         }
-        fprintf(fout, "%s\n", bigfile_fname_ptr);
+        fprintf(fout, "%s\n", bigfile_fname);
         paranoid_fclose(fout);
     }
-    mr_free(bigfile_fname_ptr);
-
-    paranoid_free(bigfile_fname);
-    paranoid_free(checksum);
-    paranoid_free(command);
-    paranoid_free(tmp);
+    mr_free(bigfile_fname);
 
     return (retval);