Changeset 2405 in MondoRescue

Timestamp:

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

Author:

Bruno Cornec

Message:

Removes some malloc_string static allocation

Location:

branches/2.2.10/mondo/src

Files:

• common/libmondo-archive.c (modified) (25 diffs)
• common/libmondo-cli.c (modified) (3 diffs)
• common/libmondo-devices.c (modified) (4 diffs)
• common/libmondo-filelist.c (modified) (4 diffs)
• common/libmondo-fork.c (modified) (4 diffs)
• common/libmondo-raid.c (modified) (5 diffs)
• common/libmondo-stream.c (modified) (5 diffs)
• common/libmondo-string.c (modified) (3 diffs)
• common/libmondo-tools.c (modified) (3 diffs)
• include/my-stuff.h (modified) (1 diff)
• mondorestore/mondo-prep.c (modified) (4 diffs)
• mondorestore/mondo-rstr-compare.c (modified) (7 diffs)
• mondorestore/mondo-rstr-tools.c (modified) (8 diffs)
• mondorestore/mondorestore.c (modified) (7 diffs)

branches/2.2.10/mondo/src/common/libmondo-archive.c

@@ -979 +979 @@
 void *create_afio_files_in_background(void *inbuf)
 {
-    long int archiving_set_no;
-    char *archiving_filelist_fname;
-    char *archiving_afioball_fname;
+    long int archiving_set_no = 0L;
+    char *archiving_filelist_fname = NULL;
+    char *archiving_afioball_fname = NULL;
     char *curr_xattr_list_fname = NULL;
     char *curr_acl_list_fname = NULL;
@@ -994 +994 @@
     int this_thread_no = g_current_thread_no++;
 
-    malloc_string(archiving_filelist_fname);
-    malloc_string(archiving_afioball_fname);
     p_last_set_archived = (int *) inbuf;
     p_archival_threads_running = (int *) (inbuf + 4);
@@ -1002 +1000 @@
     bkpinfo_bis = (struct s_bkpinfo *) (inbuf + BKPINFO_LOC_OFFSET);
 
-    sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, 0L);
-    for (archiving_set_no = 0; does_file_exist(archiving_filelist_fname);
-         sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no)) {
+    mr_asprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, 0L);
+
+    while (does_file_exist(archiving_filelist_fname)) {
         if (g_exiting) {
+            mr_free(archiving_filelist_fname);
             fatal_error("Execution run aborted (pthread)");
         }
         if (archiving_set_no >= MAX_NOOF_SETS_HERE) {
+            mr_free(archiving_filelist_fname);
             fatal_error("Maximum number of filesets exceeded. Adjust MAX_NOOF_SETS_HERE, please.");
         }
         if (!semaphore_p()) {
             log_msg(3, "P sem failed (pid=%d)", (int) getpid());
+            mr_free(archiving_filelist_fname);
             fatal_error("Cannot get semaphore P");
         }
@@ -1020 +1021 @@
         *p_next_set_to_archive = *p_next_set_to_archive + 1;
         if (!semaphore_v()) {
+            mr_free(archiving_filelist_fname);
             fatal_error("Cannot get semaphore V");
         }
 
         /* backup this set of files */
-        sprintf(archiving_afioball_fname, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no, bkpinfo->zip_suffix);
-        sprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
+        mr_asprintf(archiving_afioball_fname, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no, bkpinfo->zip_suffix);
+        mr_free(archiving_filelist_fname);
+        mr_asprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
         if (!does_file_exist(archiving_filelist_fname)) {
-            log_msg(3,
-                    "%s[%d:%d] - well, I would archive %d, except that it doesn't exist. I'll stop now.",
-                    FORTY_SPACES, getpid(), this_thread_no,
-                    archiving_set_no);
+            log_msg(3, "[%d:%d] - well, I would archive %d, except that it doesn't exist. I'll stop now.", getpid(), this_thread_no, archiving_set_no);
             break;
         }
@@ -1036 +1036 @@
         mr_asprintf(tmp, AFIOBALL_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no - ARCH_BUFFER_NUM, bkpinfo->zip_suffix);
         if (does_file_exist(tmp)) {
-            log_msg(4, "%s[%d:%d] - waiting for storer", FORTY_SPACES,
-                    getpid(), this_thread_no);
+            log_msg(4, "[%d:%d] - waiting for storer", getpid(), this_thread_no);
             while (does_file_exist(tmp)) {
                 sleep(1);
@@ -1045 +1044 @@
         mr_free(tmp);
 
-        log_msg(4, "%s[%d:%d] - EXATing %d...", FORTY_SPACES, getpid(),
-                this_thread_no, archiving_set_no);
+        log_msg(4, "[%d:%d] - EXATing %d...", getpid(), this_thread_no, archiving_set_no);
+
         if (g_getfattr) {
             mr_asprintf(curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
@@ -1058 +1057 @@
         }
 
-        log_msg(4, "%s[%d:%d] - archiving %d...", FORTY_SPACES, getpid(),
-                this_thread_no, archiving_set_no);
-        res =
-            archive_this_fileset(archiving_filelist_fname,
-                                 archiving_afioball_fname,
-                                 archiving_set_no);
+        log_msg(4, "[%d:%d] - archiving %d...", getpid(), this_thread_no, archiving_set_no);
+        res = archive_this_fileset(archiving_filelist_fname, archiving_afioball_fname, archiving_set_no);
+        mr_free(archiving_afioball_fname);
+
         retval += res;
 
@@ -1069 +1066 @@
             log_to_screen("Errors occurred while archiving set %ld. Please review logs.", archiving_set_no);
         }
+
         if (!semaphore_p()) {
+            mr_free(archiving_filelist_fname);
             fatal_error("Cannot get semaphore P");
         }
@@ -1080 +1079 @@
 
         if (!semaphore_v()) {
+            mr_free(archiving_filelist_fname);
             fatal_error("Cannot get semaphore V");
         }
-        log_msg(4, "%s[%d:%d] - archived %d OK", FORTY_SPACES, getpid(),
-                this_thread_no, archiving_set_no);
+        log_msg(4, "[%d:%d] - archived %d OK", getpid(), this_thread_no, archiving_set_no);
         archiving_set_no++;
-    }
+
+        mr_free(archiving_filelist_fname);
+        mr_asprintf(archiving_filelist_fname, FILELIST_FNAME_RAW_SZ, bkpinfo->tmpdir, archiving_set_no);
+    }
+    mr_free(archiving_filelist_fname);
+
     if (!semaphore_p()) {
         fatal_error("Cannot get semaphore P");
@@ -1093 +1097 @@
         fatal_error("Cannot get semaphore V");
     }
-    log_msg(3, "%s[%d:%d] - exiting", FORTY_SPACES, getpid(),
-            this_thread_no);
-    paranoid_free(archiving_filelist_fname);
-    paranoid_free(archiving_afioball_fname);
+    log_msg(3, "[%d:%d] - exiting", getpid(), this_thread_no);
     pthread_exit(NULL);
 }
@@ -1327 +1328 @@
     assert(bkpinfo != NULL);
     malloc_string(result_str);
-    transfer_block =
-        malloc(sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
+    transfer_block = malloc(sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
     memset((void *) transfer_block, 0,
            sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
@@ -1638 +1638 @@
     char *message_to_screen = NULL;
     char *sz_blank_disk = NULL;
-    char *fnam;
     char *tmp2 = NULL;
     char *tmp3 = NULL;
@@ -1645 +1644 @@
 
     malloc_string(old_pwd);
-    malloc_string(fnam);
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(destfile);
@@ -1879 +1877 @@
     }
     paranoid_free(old_pwd);
-    paranoid_free(fnam);
     return (retval);
 }
@@ -2529 +2526 @@
 /**
  * Make sure the user has a valid CD-R(W) in the CD drive.
- * @param cdrw_dev Set to the CD-R(W) device checked.
- * @param keep_looping If TRUE, keep pestering user until they insist
- * or insert a correct CD; if FALSE, only check once.
- * @return 0 (there was an OK CD in the drive) or 1 (there wasn't).
- */
-int interrogate_disk_currently_in_cdrw_drive(char *cdrw_dev, bool keep_looping) {
-    int res = 0;
-    char *bkp = NULL;
+ * @return the CD-R(W) device checked or NULL
+ */
+char *interrogate_disk_currently_in_cdrw_drive(char *cdrw_dev) {
     char *cdrecord = NULL;
-
-    mr_asprintf(bkp, "%s", cdrw_dev);
-    if (find_cdrw_device(cdrw_dev)) {
-        strcpy(cdrw_dev, bkp);
-    } else {
+    char *cdrw_dev = NULL;
+
+    cdrw_dev = find_cdrw_device();
+    if (cdrw_dev != NULL) {
         if (!system("which cdrecord > /dev/null 2> /dev/null")) {
             mr_asprintf(cdrecord, "cdrecord dev=%s -atip", cdrw_dev);
@@ -2551 +2542 @@
         }
         if (cdrecord != NULL) {
-            if (!keep_looping) {
-                retract_CD_tray_and_defeat_autorun();
-                res = run_program_and_log_output(cdrecord, 5);
-            } else {
-                while ((res = run_program_and_log_output(cdrecord, 5))) {
-                    retract_CD_tray_and_defeat_autorun();
-                    if (ask_me_yes_or_no
-                        ("Unable to examine CD. Are you sure this is a valid CD-R(W) CD?"))
-                    {
-                        log_msg(1, "Well, he insisted...");
-                        break;
-                    }
-                }
+            retract_CD_tray_and_defeat_autorun();
+            if (run_program_and_log_output(cdrecord, 5)) {
+                /* As it didn't work, return NULL */
+                mr_free(cdrw_dev);
             }
         }
-    }
-    mr_free(bkp);
-
-    mr_free(cdrecord);
-    return (res);
+        mr_free(cdrecord);
+    }
+    return(cdrw_dev);
 }
 
@@ -2586 +2566 @@
     char *tmp = NULL;
     char *cdrom_dev = NULL;
-    char *cdrw_dev;
+    char *cdrw_dev = NULL;
     char *our_serial_str = NULL;
     bool ok_go_ahead_burn_it;
@@ -2592 +2572 @@
     int attempt_to_mount_returned_this = 999;
     char *mtpt = NULL;
-    char *szcdno;
-    char *szserfname;
-    char *szunmount;
+    char *szcdno = NULL;
+    char *szserfname = NULL;
+    char *szunmount = NULL;
     char *mds = NULL;
-
-    malloc_string(cdrw_dev);
-    malloc_string(szcdno);
-    malloc_string(szserfname);
-    malloc_string(szunmount);
 
     mds = media_descriptor_string(g_backup_media_type);
@@ -2621 +2596 @@
         mr_asprintf(tmp, "umount %s", cdrom_dev);
         run_program_and_log_output(tmp, 1);
-        sprintf(szcdno, "%s/archives/THIS-CD-NUMBER", mtpt);
-        sprintf(szserfname, "%s/archives/SERIAL-STRING", mtpt);
-        sprintf(szunmount, "umount %s", mtpt);
+        mr_asprintf(szcdno, "%s/archives/THIS-CD-NUMBER", mtpt);
+        mr_asprintf(szserfname, "%s/archives/SERIAL-STRING", mtpt);
+        mr_asprintf(szunmount, "umount %s", mtpt);
         cd_number = -1;
         mr_asprintf(tmp, "mount %s %s", cdrom_dev, mtpt);
@@ -2629 +2604 @@
         attempt_to_mount_returned_this = run_program_and_log_output(tmp, 1);
         mr_free(tmp);
+
         if (attempt_to_mount_returned_this) {
             log_msg(4, "Failed to mount %s at %s", cdrom_dev, mtpt);
             log_to_screen("If there's a CD/DVD in the drive, it's blank.");
-            /*
-               if (interrogate_disk_currently_in_cdrw_drive(cdrw_dev, FALSE))
-               {
-               ok_go_ahead_burn_it = FALSE;
-               log_to_screen("There isn't a writable CD/DVD in the drive.");
-               }
-               else
-               {
-               log_to_screen("Confirmed. There is a blank CD/DVD in the drive.");
-               }
-             */
-        } else if (!does_file_exist(szcdno)
-                   || !does_file_exist(szserfname)) {
+        } else if (!does_file_exist(szcdno) || !does_file_exist(szserfname)) {
             mds = media_descriptor_string(g_backup_media_type);
-            log_to_screen
-                ("%s has data on it but it's probably not a Mondo CD.", mds);
+            log_to_screen("%s has data on it but it's probably not a Mondo CD.", mds);
             mr_free(mds);
         } else {
@@ -2664 +2627 @@
             // FIXME - should be able to use last_line_of_file(), surely?
         }
+        mr_free(szcdno);
+        mr_free(szserfname);
+
         run_program_and_log_output(szunmount, 1);
+        mr_free(szunmount);
+
         log_msg(2, "paafcd: cd_number = %d", cd_number);
         log_msg(2, "our serial str = %s; g_serial_string = %s", our_serial_str, g_serial_string);
@@ -2686 +2654 @@
         log_msg(2,
                 "paafcd: Can't find CD-ROM drive. Perhaps it has a blank %s in it?", mds);
-        if (interrogate_disk_currently_in_cdrw_drive(cdrw_dev, FALSE)) {
+        cdrw_dev = interrogate_disk_currently_in_cdrw_drive();
+        if (cdrw_dev == NULL) {
             ok_go_ahead_burn_it = FALSE;
             log_to_screen("There isn't a writable %s in the drive.", mds);
         }
+        mr_free(cdrw_dev);
         mr_free(mds);
     }
@@ -2709 +2679 @@
 
     mds = media_descriptor_string(g_backup_media_type);
-    log_msg(2,
-            "paafcd: OK, I assume I have a blank/reusable %s in the drive...", mds);
+    log_msg(2, "paafcd: OK, I assume I have a blank/reusable %s in the drive...", mds);
 
     log_to_screen("Proceeding w/ %s in drive.", mds);
     mr_free(mds);
 
-    paranoid_free(cdrw_dev);
     paranoid_free(mtpt);
-    paranoid_free(szcdno);
-    paranoid_free(szserfname);
-    paranoid_free(szunmount);
     if (pmountable) {
         if (attempt_to_mount_returned_this) {
@@ -2729 +2694 @@
 
 }
-
-
-
-
-
-
 
 
@@ -2764 +2723 @@
 
 /* @} - end of utilityGroup */
-
-
-
-
-
-
 
 

branches/2.2.10/mondo/src/common/libmondo-cli.c

@@ -654 +654 @@
 
     /*@ buffers ** */
-    char *tmp = NULL;
     char *tmp1 = NULL;
     char *tmp2 = NULL;
@@ -668 +667 @@
 
     struct stat buf;
-
-    malloc_string(tmp);
 
     assert(bkpinfo != NULL);
@@ -1377 +1374 @@
         finish(0);
     }
-    mr_free(tmp);
 
     if ((flag_set['L']) && (! bkpinfo->restore_data)) {

branches/2.2.10/mondo/src/common/libmondo-devices.c

@@ -1407 +1407 @@
     char *tmp = NULL;
     char *p = NULL;
-    char *tmp1 = NULL;
     char *mds = NULL;
     char *sz_size = NULL;
     char *command = NULL;
     char *comment = NULL;
-    char *prompt;
     int i;
     FILE *fin;
 
-    malloc_string(prompt);
-    malloc_string(tmp1);
     assert(bkpinfo != NULL);
     bkpinfo->nonbootable_backup = FALSE;
@@ -1456 +1452 @@
         if (archiving_to_media) {
             if ((bkpinfo->backup_media_type != dvd) && (bkpinfo->backup_media_type != usb)) {
-                if (ask_me_yes_or_no
-                    ("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?"))
-                {
+                if (ask_me_yes_or_no("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")) {
                     bkpinfo->manual_cd_tray = TRUE;
                 }
             }
-            if ((bkpinfo->compression_level =
-                 which_compression_level()) == -1) {
+            if ((bkpinfo->compression_level = which_compression_level()) == -1) {
                 log_to_screen("User has chosen not to backup the PC");
                 finish(1);
@@ -1495 +1488 @@
             mr_free(comment);
 
-            bkpinfo->cdrw_speed = atoi(tmp1);   // if DVD then this shouldn't ever be used anyway :)
+            bkpinfo->cdrw_speed = atoi(tmp);    // if DVD then this shouldn't ever be used anyway :)
+            mr_free(tmp);
 
             mr_asprintf(comment, "How much data (in Megabytes) will each %s store?", mds);
@@ -2022 +2016 @@
     }
     paranoid_free(sz_size);
-    paranoid_free(tmp1);
-    paranoid_free(prompt);
     return (0);
 }

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

@@ -1507 +1507 @@
     char *sz_filelist;
     char *exclude_paths = NULL;
-    char *tmp;
     int i;
     FILE *fout;
@@ -1516 +1515 @@
     char *tmp2 = NULL;
 
-    malloc_string(tmp);
-    malloc_string(g_skeleton_filelist);
     mr_asprintf(sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
     if (!include_paths && !userdef_filelist) {
@@ -1587 +1584 @@
         log_msg(2, "Excluding paths = '%s'", exclude_paths);
         log_msg(2, "Generating skeleton filelist so that we can track our progress");
-        sprintf(g_skeleton_filelist, "%s/tmpfs/skeleton.txt", bkpinfo->tmpdir);
+        mr_asprintf(g_skeleton_filelist, "%s/tmpfs/skeleton.txt", bkpinfo->tmpdir);
         make_hole_for_file(g_skeleton_filelist);
         log_msg(4, "g_skeleton_entries = %ld", g_skeleton_entries);
@@ -1631 +1628 @@
     paranoid_free(sz_filelist);
     log_msg(2, "Freeing variables");
-    paranoid_free(tmp);
-    paranoid_free(g_skeleton_filelist);
+    mr_free(g_skeleton_filelist);
     log_msg(2, "Exiting");
     return (0);

branches/2.2.10/mondo/src/common/libmondo-fork.c

@@ -95 +95 @@
  * @return Exit code of @c mkisofs (0 is success, anything else indicates failure).
  */
-int
-eval_call_to_make_ISO(char *basic_call, char *isofile, int cd_no, char *what_i_am_doing) {
+int eval_call_to_make_ISO(char *basic_call, char *isofile, int cd_no, char *what_i_am_doing) {
 
     /*@ int's  *** */
@@ -106 +105 @@
     char *ultimate_call = NULL;
     char *tmp = NULL;
-    char *incoming, *old_stderr; 
         
     char *cd_number_str = NULL;
@@ -119 +117 @@
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(isofile);
-    malloc_string(incoming);
-    malloc_string(old_stderr);
-
-    incoming[0] = '\0';
-    old_stderr[0] = '\0';
 
     if ((bkpinfo->netfs_user) && (strstr(bkpinfo->netfs_proto,"nfs"))) {
@@ -187 +180 @@
     }
     mr_free(command);
-    paranoid_free(incoming);
-    paranoid_free(old_stderr);
     return (retval);
 }

branches/2.2.10/mondo/src/common/libmondo-raid.c

@@ -591 +591 @@
 {
     FILE *fin;
-    char *tmp;
     char *label;
     char *value;
@@ -597 +596 @@
     int v;
 
-    malloc_string(tmp);
-    malloc_string(label);
-    malloc_string(value);
     assert(raidlist != NULL);
     assert_string_is_neither_NULL_nor_zerolength(fname);
@@ -606 +602 @@
         log_it("Raidtab is very small or non-existent. Ignoring it.");
         raidlist->entries = 0;
-        paranoid_free(tmp);
-        paranoid_free(label);
-        paranoid_free(value);
         return (0);
     }
     if (!(fin = fopen(fname, "r"))) {
         log_it("Cannot open raidtab");
-        paranoid_free(tmp);
-        paranoid_free(label);
-        paranoid_free(value);
         return (1);
     }
     items = 0;
     log_it("Loading raidtab...");
+    malloc_string(label);
+    malloc_string(value);
     get_next_raidtab_line(fin, label, value);
     while (!feof(fin)) {
@@ -631 +623 @@
             v++;
             get_next_raidtab_line(fin, label, value);
-            log_it(tmp);
         }
         raidlist->el[items].additional_vars.entries = v;
@@ -651 +642 @@
     log_msg(1, "Raidtab loaded successfully.");
     log_msg(1, "%d RAID devices in raidtab", items);
-    paranoid_free(tmp);
     paranoid_free(label);
     paranoid_free(value);

branches/2.2.10/mondo/src/common/libmondo-stream.c

@@ -1315 +1315 @@
     while (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
         res =
-            read_header_block_from_stream(&temp_size, temp_fname,
-                                          &ctrl_chr);
+            read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
         if (ctrl_chr == BLK_START_AN_AFIO_OR_SLICE) {
             break;
@@ -1326 +1325 @@
     while (ctrl_chr != BLK_START_FILE) {
         res =
-            read_header_block_from_stream(&temp_size, temp_fname,
-                                          &ctrl_chr);
+            read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
         if (ctrl_chr == BLK_START_FILE) {
             break;
@@ -1348 +1346 @@
     }
     while (strcmp(pA, pB)) {
-        log_msg(6, "Skipping %s (it's not %s)", temp_fname,
-                the_file_I_was_reading);
+        log_msg(6, "Skipping %s (it's not %s)", temp_fname, the_file_I_was_reading);
         for (size = temp_size; size > 0; size -= bytes_to_write) {
             bytes_to_write =
@@ -1357 +1354 @@
         }
         res =
-            read_header_block_from_stream(&temp_size, temp_fname,
-                                          &ctrl_chr);
+            read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
         if (ctrl_chr != BLK_STOP_FILE) {
             wrong_marker(BLK_STOP_FILE, ctrl_chr);
         }
         res =
-            read_header_block_from_stream(&temp_size, temp_fname,
-                                          &ctrl_chr);
+            read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
         if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
             wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE, ctrl_chr);
         }
         res =
-            read_header_block_from_stream(&temp_size, temp_fname,
-                                          &ctrl_chr);
+            read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
         if (ctrl_chr != BLK_START_AN_AFIO_OR_SLICE) {
             wrong_marker(BLK_START_AN_AFIO_OR_SLICE, ctrl_chr);
         }
         res =
-            read_header_block_from_stream(&temp_size, temp_fname,
-                                          &ctrl_chr);
+            read_header_block_from_stream(&temp_size, temp_fname, &ctrl_chr);
         if (ctrl_chr != BLK_START_FILE) {
             wrong_marker(BLK_START_FILE, ctrl_chr);
@@ -1393 +1386 @@
         }
     }
-    log_msg(2, "Reading %s (it matches %s)", temp_fname,
-            the_file_I_was_reading);
+    log_msg(2, "Reading %s (it matches %s)", temp_fname, the_file_I_was_reading);
     paranoid_free(temp_fname);
     paranoid_free(datablock);

branches/2.2.10/mondo/src/common/libmondo-string.c

@@ -202 +202 @@
     long outval;
     int i;
-    char *tmp;
     char *tmp1 = NULL;
     char ch;
@@ -208 +207 @@
     assert_string_is_neither_NULL_nor_zerolength(incoming);
 
-    malloc_string(tmp);
     if (!incoming[0]) {
-        free(tmp);
         return (0);
     }
@@ -216 +213 @@
         fatal_error("Please use integers only. No decimal points.");
     }
-    strcpy(tmp, incoming);
-    i = (int) strlen(tmp);
-    if (tmp[i - 1] == 'B' || tmp[i - 1] == 'b') {
-        tmp[i - 1] = '\0';
-    }
-    for (i = 0; i < (int) strlen(tmp) && isdigit(tmp[i]); i++);
-    ch = tmp[i];
-    tmp[i] = '\0';
-    outval = atol(tmp);
-    paranoid_free(tmp);
+
+    mr_asprintf(tmp1, "%s", incoming);
+    i = (int) strlen(tmp1);
+    if (tmp1[i - 1] == 'B' || tmp1[i - 1] == 'b') {
+        tmp1[i - 1] = '\0';
+    }
+    for (i = 0; i < (int) strlen(tmp1) && isdigit(tmp1[i]); i++);
+    ch = tmp1[i];
+    tmp1[i] = '\0';
+    outval = atol(tmp1);
+    paranoid_free(tmp1);
+
     if (ch == 'g' || ch == 'G') {
         outval = outval * 1024;

branches/2.2.10/mondo/src/common/libmondo-tools.c

@@ -393 +393 @@
     char *mondo_mkisofs_sz = NULL;
     char *command = NULL;
-    char *mtpt;
     char *hostname = NULL;
     char *ip_address = NULL;
@@ -413 +412 @@
     }
 
-    malloc_string(mtpt);
     bkpinfo->optimal_set_size =
         (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type) ? 16 : 16) *
@@ -700 +698 @@
     }
     g_backup_media_type = bkpinfo->backup_media_type;
-    paranoid_free(mtpt);
     return (retval);
 }

branches/2.2.10/mondo/src/include/my-stuff.h

@@ -344 +344 @@
 #define ARCH_THREADS 2          ///< The number of simultaneous threads running afio in the background.
 #define ARCH_BUFFER_NUM (ARCH_THREADS*4)    // Number of permissible queued afio files
-#define FORTY_SPACES "                                         "    ///< 40 spaces.
-    ///< Size of the tmpfs, in megabytes, to attempt to mount (to speed up Mondo).
-/*
-#define PPCFG_RAMDISK_SIZE 350
-*/
-
 #define DO_MBR_PLEASE "/tmp/DO-MBR-PLEASE"
 

branches/2.2.10/mondo/src/mondorestore/mondo-prep.c

@@ -61 +61 @@
 {
     char *command = NULL;
-    char *tmp;
     int lino;
     int i;
@@ -72 +71 @@
 // If LVMs are present and a zero-and-reboot wasn't recently undertaken
 // then zero & insist on reboot.
-    malloc_string(tmp);
     buf = malloc(blocksize);
     if (does_file_exist("/tmp/i-want-my-lvm"))  // FIXME - cheating :)
@@ -91 +89 @@
         if (lino == drivelist->entries) {
 // zero & reboot
-            log_to_screen
-                ("I am sorry for the inconvenience but I must ask you to reboot.");
-            log_to_screen
-                ("I need to reset the Master Boot Record; in order to be");
-            log_to_screen
-                ("sure the kernel notices, I must reboot after doing it.");
+            log_to_screen("I am sorry for the inconvenience but I must ask you to reboot.");
+            log_to_screen("I need to reset the Master Boot Record; in order to be");
+            log_to_screen("sure the kernel notices, I must reboot after doing it.");
             log_to_screen("Please hit 'Enter' to reboot.");
             for (lino = 0; lino < drivelist->entries; lino++) {
@@ -127 +122 @@
     }
 // Still here? Cool!
-    paranoid_free(tmp);
     log_msg(1, "Cool. I didn't have to wipe anything.");
 }

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);

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

@@ -698 +698 @@
 t_bkptype media_specified_by_user;
 
-malloc_string(tmp);
 //  assert_string_is_neither_NULL_nor_zerolength(cfg_file);
 assert(bkpinfo != NULL);
@@ -1099 +1098 @@
 g_backup_media_type = bkpinfo->backup_media_type;
 paranoid_free(value);
-paranoid_free(tmp);
 return (0);
 
@@ -1499 +1497 @@
     char *command = NULL;
     char *boot_device = NULL;
-    char *rootdev;
-    char *rootdrive;
-    char *conffile;
     char *tmp = NULL;
     char *editor = NULL;
@@ -1509 +1504 @@
     bool done;
 
-    malloc_string(rootdev);
-    malloc_string(rootdrive);
-    malloc_string(conffile);
     assert_string_is_neither_NULL_nor_zerolength(bd);
     mr_asprintf(boot_device, "%s", bd);
@@ -1617 +1609 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(rootdev);
-    paranoid_free(rootdrive);
-    paranoid_free(conffile);
 
     return (res);
@@ -2190 +2179 @@
 
    /** malloc *****/
-    char *device;
     char *command = NULL;
     char *cfg_file = NULL;
-    char *mounted_cfgf_path;
     char *tmp = NULL;
     char *tmp1 = NULL;
     char *mountpt = NULL;
-    char *ramdisk_fname;
     char *mountlist_file = NULL;
     bool extract_mountlist_stub = FALSE;
@@ -2205 +2191 @@
 
     assert(bkpinfo != NULL);
-    malloc_string(mounted_cfgf_path);
-    malloc_string(ramdisk_fname);
-    malloc_string(device);
     log_msg(2, "gcffa --- starting");
     log_to_screen("I'm thinking...");
     mr_asprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
-    device[0] = '\0';
     chdir(bkpinfo->tmpdir);
     mr_asprintf(cfg_file, "%s", MONDO_CFG_FILE_STUB);
@@ -2394 +2376 @@
     }
     g_backup_media_type = bkpinfo->backup_media_type;
-    paranoid_free(device);
-    paranoid_free(mounted_cfgf_path);
-    paranoid_free(ramdisk_fname);
     return (retval);
 }

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -1028 +1028 @@
     char *tmp = NULL;
     char *bzip2_command = NULL;
-    char *ntfsprog_command;
     char *suffix = NULL;
     char *sz_devfile = NULL;
@@ -1050 +1049 @@
     ubuf = &the_utime_buf;
     assert(bkpinfo != NULL);
-
-    malloc_string(ntfsprog_command);
 
     pathname_of_last_file_restored[0] = '\0';
@@ -1268 +1265 @@
     mr_free(outfile_fname);
     paranoid_free(bigblk);
-    paranoid_free(ntfsprog_command);
 
     return (retval);
@@ -1307 +1303 @@
     char *command = NULL;
     char *outfile_fname = NULL;
-    char *ntfsprog_command;
     char *sz_devfile = NULL;
     char *ntfsprog_fifo = NULL;
@@ -1328 +1323 @@
 
     malloc_string(tmp);
-    malloc_string(ntfsprog_command);
     old_loglevel = g_loglevel;
     assert(bkpinfo != NULL);
@@ -1516 +1510 @@
 
     paranoid_free(tmp);
-    paranoid_free(ntfsprog_command);
     g_loglevel = old_loglevel;
     return (retval);
@@ -1929 +1922 @@
  * @return 0 for success, nonzero for failure.
  */
-int
-restore_all_biggiefiles_from_CD(struct s_node *filelist)
-{
+int restore_all_biggiefiles_from_CD(struct s_node *filelist) {
+
     int retval = 0;
     int res = 0;