Changeset 122 in MondoRescue for trunk/mondo/mondo/common/libmondo-verify.c

Timestamp:

Nov 15, 2005, 12:01:12 AM (18 years ago)

Author:

bcornec

Message:

memory management going on (libmondo-verify.c, libmondo-devices.c, libmondo-string.c, libmondo-stream.c)

File:

• trunk/mondo/mondo/common/libmondo-verify.c (modified) (17 diffs)

trunk/mondo/mondo/common/libmondo-verify.c

@@ -608 +608 @@
     char *orig_cksum;
     char *tmp;
-    char *slice_fnam;
+    char *slice_fnam = (char *)&res;
 
     /*@ pointers ******************************************************** */
@@ -616 +616 @@
     long long slice_siz;
 
-    malloc_string(slice_fnam);
     assert(bkpinfo != NULL);
     assert_string_is_neither_NULL_nor_zerolength(biggie_fname);
@@ -627 +626 @@
     }
     asprintf(&test_file, "%s/temporary-%s", bkpinfo->tmpdir, p);
-    /* BERLIOS: useless
-       asprintf(&tmp,
-       "Temporarily copying biggiefile %s's slices from tape to '%s'",
-       p, test_file);
-       log_it(tmp); 
-       paranoid_free(tmp);
-     */
+    asprintf(&tmp,
+    "Temporarily copying biggiefile %s's slices from tape to '%s'",
+    p, test_file);
+    log_it(tmp); 
+    paranoid_free(tmp);
     for (res =
          read_header_block_from_stream(&slice_siz, slice_fnam, &ctrl_chr);
@@ -645 +642 @@
         res = read_file_from_stream_to_file(bkpinfo, test_file, slice_siz);
         unlink(test_file);
+        paranoid_free(slice_fnam);
+        slice_fnam = (char *)&res;
         res =
             read_header_block_from_stream(&slice_siz, slice_fnam,
@@ -654 +653 @@
         current_slice_number++;
         retval += res;
+        paranoid_free(slice_fnam);
+        slice_fnam = (char *)&res;
     }
     paranoid_free(test_file);
@@ -705 +706 @@
     /*@ buffers ***************************************************** */
     char *tmp;
-    char *fname;
+    char *fname = (char *)&res;             /* Should NOT be NULL */
     char *curr_xattr_list_fname;
     char *curr_acl_list_fname;
@@ -713 +714 @@
 
     assert(bkpinfo != NULL);
-    malloc_string(fname);
 
     asprintf(&curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ,
@@ -725 +725 @@
                        "Please wait. This may take a couple of hours.", "",
                        total_afioballs);
-    res = read_header_block_from_stream(&size, fname, &ctrl_chr);
+    res = read_header_block_from_stream(&size, NULL, &ctrl_chr);
     if (ctrl_chr != BLK_START_AFIOBALLS) {
         iamhere("YOU SHOULD NOT GET HERE");
@@ -731 +731 @@
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
             res =
-                read_EXAT_files_from_tape(bkpinfo, &size, fname, &ctrl_chr,
+                read_EXAT_files_from_tape(bkpinfo, &size, NULL, &ctrl_chr,
                                           curr_xattr_list_fname,
                                           curr_acl_list_fname);
@@ -744 +744 @@
     for (res = read_header_block_from_stream(&size, fname, &ctrl_chr);
          ctrl_chr != BLK_STOP_AFIOBALLS;
-         res = read_header_block_from_stream(&size, fname, &ctrl_chr)) {
+         res = 
+         read_header_block_from_stream(&size, fname, &ctrl_chr)) {
         asprintf(&curr_xattr_list_fname, XATTR_LIST_FNAME_RAW_SZ,
                  bkpinfo->tmpdir, current_afioball_number);
@@ -751 +752 @@
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
             iamhere("Reading EXAT files from tape");
+            paranoid_free(fname);
+            fname = (char *)&res;
             res =
                 read_EXAT_files_from_tape(bkpinfo, &size, fname, &ctrl_chr,
@@ -777 +780 @@
         current_afioball_number++;
         g_current_progress++;
+        paranoid_free(fname);
+        fname = (char *)&res;
         res = read_header_block_from_stream(&size, fname, &ctrl_chr);
         if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
             wrong_marker(BLK_STOP_AN_AFIO_OR_SLICE, ctrl_chr);
         }
+        paranoid_free(fname);
+        fname = (char *)&res;
     }
     log_msg(1, "All done with afioballs");
@@ -810 +817 @@
 
     /*@ buffers ******************************************************** */
-    char *orig_fname, *logical_fname;
+    char *orig_fname = (char *)&ctrl_chr;   /* Should NOT be NULL */
+    char *logical_fname;
     char *comment;
     char *curr_xattr_list_fname;
@@ -821 +829 @@
 
     assert(bkpinfo != NULL);
-    malloc_string(orig_fname);
 
     asprintf(&curr_xattr_list_fname, XATTR_BIGGLST_FNAME_RAW_SZ,
@@ -829 +836 @@
     asprintf(&comment, "Verifying all bigfiles.");
     log_to_screen(comment);
-    /*
-       asprintf(&tmp, "%s/biggielist.txt", bkpinfo->tmpdir);
-       noof_biggiefiles = count_lines_in_file (tmp); // pointless
-       paranoid_free(tmp);
-     */
     res = read_header_block_from_stream(&size, orig_fname, &ctrl_chr);
     if (ctrl_chr != BLK_START_BIGGIEFILES) {
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
             iamhere("Grabbing the EXAT biggiefiles");
+            paranoid_free(orig_fname);
+            orig_fname = (char *)&ctrl_chr;
             res =
                 read_EXAT_files_from_tape(bkpinfo, &size, orig_fname,
@@ -846 +850 @@
     paranoid_free(curr_xattr_list_fname);
     paranoid_free(curr_acl_list_fname);
+    paranoid_free(orig_fname);
+    orig_fname = (char *)&ctrl_chr;
 
     if (ctrl_chr != BLK_START_BIGGIEFILES) {
@@ -884 +890 @@
         current_biggiefile_number++;
         g_current_progress++;
+        paranoid_free(orig_fname);
+        orig_fname = (char *)&ctrl_chr;
     }
     close_progress_form();
-    paranoid_free(orig_fname);
     return (retval);
 }