Changeset 3340 in MondoRescue for branches/3.2/mondo/src/common/libmondo-archive.c

Timestamp:

Feb 12, 2015, 7:38:20 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Avoid using size_of_all_biggiefiles() at each use, but creates an intermediate long variable for that.

File:

• branches/3.2/mondo/src/common/libmondo-archive.c (modified) (12 diffs)

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

@@ -826 +826 @@
     }
 
-    estimated_total_noof_slices = size_of_all_biggiefiles_K(bkpinfo) / bkpinfo->optimal_set_size + 1;
+    estimated_total_noof_slices = size_of_all_biggiefiles_K() / bkpinfo->optimal_set_size + 1L;
 
     /* TODO: add netfs stuff here? */
@@ -1924 +1924 @@
  * @see slice_up_file_etc
  */
-int
-make_slices_and_images(char *biggielist_fname)
-{
+int make_slices_and_images(char *biggielist_fname) {
 
     /*@ pointers ******************************************* */
@@ -1942 +1940 @@
     long noof_biggie_files = 0L;
     long estimated_total_noof_slices = 0L;
+    long size_of_all_biggiefiles = 0L;
 
     /*@ int ************************************************ */
@@ -1955 +1954 @@
     assert_string_is_neither_NULL_nor_zerolength(biggielist_fname);
 
-    estimated_total_noof_slices = size_of_all_biggiefiles_K() / bkpinfo->optimal_set_size + 1L;
-
-    log_msg(1, "size of all biggiefiles = %ld", size_of_all_biggiefiles_K());
-    log_msg(1, "estimated_total_noof_slices = %ld KB / %ld KB = %ld", size_of_all_biggiefiles_K(), bkpinfo->optimal_set_size, estimated_total_noof_slices);
+    size_of_all_biggiefiles = size_of_all_biggiefiles_K();
+    estimated_total_noof_slices = size_of_all_biggiefiles / bkpinfo->optimal_set_size + 1L;
+
+    log_msg(1, "size of all biggiefiles = %ld", size_of_all_biggiefiles);
+    log_msg(1, "estimated_total_noof_slices = %ld KB / %ld KB = %ld", size_of_all_biggiefiles, bkpinfo->optimal_set_size, estimated_total_noof_slices);
 
     if (length_of_file(biggielist_fname) < 6) {
@@ -2038 +2038 @@
 
             if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-                write_header_block_to_stream((off_t)0,
-                                             calc_checksum_of_file
-                                             (bigfile_fname),
-                                             BLK_STOP_A_BIGGIE);
+                write_header_block_to_stream((off_t)0, calc_checksum_of_file(bigfile_fname), BLK_STOP_A_BIGGIE);
             }
             retval += res;
@@ -2272 +2269 @@
     assert(bkpinfo != NULL);
     /* slice big files */
-    mvaddstr_and_log_it(g_currentY, 0,
-                        "Archiving large files to media           ");
+    mvaddstr_and_log_it(g_currentY, 0, "Archiving large files to media           ");
     mr_asprintf(biggielist, "%s/archives/biggielist.txt", bkpinfo->scratchdir);
     if (g_getfattr) {
@@ -2315 +2311 @@
     res = make_slices_and_images(biggielist);
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        write_header_block_to_stream((off_t)0, "end-of-biggiefiles",
-                                     BLK_STOP_BIGGIEFILES);
+        write_header_block_to_stream((off_t)0, "end-of-biggiefiles", BLK_STOP_BIGGIEFILES);
     }
     retval += res;
@@ -2387 +2382 @@
         mr_asprintf(curr_file, "%s", cf);
         if (!does_file_exist(curr_file)) {
-            log_msg(1,
-                    "Warning - you're trying to add a non-existent file - '%s' to the CD",
-                    curr_file);
+            log_msg(1, "Warning - you're trying to add a non-existent file - '%s' to the CD", curr_file);
         } else {
             log_msg(8, "Trying to add file %s to CD", curr_file);
@@ -2764 +2757 @@
  * @ingroup LLarchiveGroup
  */
-int
-slice_up_file_etc(char *biggie_filename, char *ntfsprog_fifo, long biggie_file_number, long noof_biggie_files, bool use_ntfsprog) {
+int slice_up_file_etc(char *biggie_filename, char *ntfsprog_fifo, long biggie_file_number, long noof_biggie_files, bool use_ntfsprog) {
 
     /*@ buffers ************************************************** */
@@ -2848 +2840 @@
         mr_getline(checksum_line, fin);
         pclose(fin);
-        totallength = length_of_file (biggie_filename);
+        totallength = length_of_file(biggie_filename);
     }
     lstat(biggie_filename, &biggiestruct.properties);
@@ -2885 +2877 @@
     }
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
-        res =
-            move_files_to_stream(slice_fname(biggie_file_number, 0,
-                                             bkpinfo->tmpdir, ""), NULL);
-    } else {
-        res =
-            move_files_to_cd(slice_fname(biggie_file_number, 0,
-                                         bkpinfo->tmpdir, ""), NULL);
-    }
-    i = bkpinfo->optimal_set_size / 256;
+        res = move_files_to_stream(slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""), NULL);
+    } else {
+        res = move_files_to_cd(slice_fname(biggie_file_number, 0, bkpinfo->tmpdir, ""), NULL);
+    }
+    i = bkpinfo->optimal_set_size / 256L;
     if (!(tempblock = (char *) malloc(256 * 1024))) {
         fatal_error("malloc error 256*1024");
@@ -2910 +2898 @@
             return (1);
         }
-        if ((i == bkpinfo->optimal_set_size / 256) && (totalread < 1.1 * totallength)) {
-            for (i = 0L; i < bkpinfo->optimal_set_size / 256; i++) {
+        if ((i == bkpinfo->optimal_set_size / 256L) && (totalread < 1.1 * totallength)) {
+            for (long j = 0L; j < bkpinfo->optimal_set_size / 256L; j++) {
                 blksize = fread(tempblock, 1, 256 * 1024, fin);
                 if (blksize > 0) {