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

Timestamp:

Nov 19, 2005, 2:27:31 AM (18 years ago)

Author:

bcornec

Message:

merge -r 125:126 $SVN_M/branches/2.05

File:

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

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

@@ -608 +608 @@
     char *orig_cksum;
     char *tmp;
-    char *slice_fnam = (char *)&res;
+    char *slice_fnam = (char *) &res;
 
     /*@ pointers ******************************************************** */
@@ -627 +627 @@
     asprintf(&test_file, "%s/temporary-%s", bkpinfo->tmpdir, p);
     asprintf(&tmp,
-    "Temporarily copying biggiefile %s's slices from tape to '%s'",
-    p, test_file);
-    log_it(tmp); 
+             "Temporarily copying biggiefile %s's slices from tape to '%s'",
+             p, test_file);
+    log_it(tmp);
     paranoid_free(tmp);
     for (res =
@@ -643 +643 @@
         unlink(test_file);
         paranoid_free(slice_fnam);
-        slice_fnam = (char *)&res;
+        slice_fnam = (char *) &res;
         res =
             read_header_block_from_stream(&slice_siz, slice_fnam,
@@ -654 +654 @@
         retval += res;
         paranoid_free(slice_fnam);
-        slice_fnam = (char *)&res;
+        slice_fnam = (char *) &res;
     }
     paranoid_free(test_file);
@@ -706 +706 @@
     /*@ buffers ***************************************************** */
     char *tmp;
-    char *fname = (char *)&res;             /* Should NOT be NULL */
+    char *fname = (char *) &res;    /* Should NOT be NULL */
     char *curr_xattr_list_fname;
     char *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);
@@ -753 +752 @@
             iamhere("Reading EXAT files from tape");
             paranoid_free(fname);
-            fname = (char *)&res;
+            fname = (char *) &res;
             res =
                 read_EXAT_files_from_tape(bkpinfo, &size, fname, &ctrl_chr,
@@ -781 +780 @@
         g_current_progress++;
         paranoid_free(fname);
-        fname = (char *)&res;
+        fname = (char *) &res;
         res = read_header_block_from_stream(&size, fname, &ctrl_chr);
         if (ctrl_chr != BLK_STOP_AN_AFIO_OR_SLICE) {
@@ -787 +786 @@
         }
         paranoid_free(fname);
-        fname = (char *)&res;
+        fname = (char *) &res;
     }
     log_msg(1, "All done with afioballs");
@@ -817 +816 @@
 
     /*@ buffers ******************************************************** */
-    char *orig_fname = (char *)&ctrl_chr;   /* Should NOT be NULL */
+    char *orig_fname = (char *) &ctrl_chr;  /* Should NOT be NULL */
     char *logical_fname;
     char *comment;
@@ -841 +840 @@
             iamhere("Grabbing the EXAT biggiefiles");
             paranoid_free(orig_fname);
-            orig_fname = (char *)&ctrl_chr;
+            orig_fname = (char *) &ctrl_chr;
             res =
                 read_EXAT_files_from_tape(bkpinfo, &size, orig_fname,
@@ -851 +850 @@
     paranoid_free(curr_acl_list_fname);
     paranoid_free(orig_fname);
-    orig_fname = (char *)&ctrl_chr;
+    orig_fname = (char *) &ctrl_chr;
 
     if (ctrl_chr != BLK_START_BIGGIEFILES) {
@@ -891 +890 @@
         g_current_progress++;
         paranoid_free(orig_fname);
-        orig_fname = (char *)&ctrl_chr;
+        orig_fname = (char *) &ctrl_chr;
     }
     close_progress_form();