Changeset 2421 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-archive.c

Timestamp:

Sep 24, 2009, 3:50:38 PM (15 years ago)

Author:

Bruno Cornec

Message:

• Remove some compiler warnings on main
• Adds function mr_chomp and mr_strip_char and use them in mr_date and call_program_and_get_last_line_of_output
• Fix call_program_and_get_last_line_of_output to return the right result using a temp file instead of popen
• Fix an issue in mr_getline_int in case of eof (returns now an empty string)
• Sequencing of Init of bkpinfo reviewed

File:

• branches/2.2.10/mondo/src/common/libmondo-archive.c (modified) (3 diffs)

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

@@ -993 +993 @@
         if (!does_file_exist(archiving_filelist_fname)) {
             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);
+            mr_free(archiving_afioball_fname);
             break;
         }
@@ -1291 +1292 @@
     malloc_string(result_str);
     transfer_block = malloc(sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
-    memset((void *) transfer_block, 0,
-           sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
+    memset((void *) transfer_block, 0, sizeof(struct s_bkpinfo) + BKPINFO_LOC_OFFSET + 64);
     p_last_set_archived = (int *) transfer_block;
     p_archival_threads_running = (int *) (transfer_block + 4);
     p_next_set_to_archive = (int *) (transfer_block + 8);
     p_list_of_fileset_flags = (char *) (transfer_block + 12);
-    memcpy((void *) (transfer_block + BKPINFO_LOC_OFFSET),
-           (void *) bkpinfo, sizeof(struct s_bkpinfo));
+    memcpy((void *) (transfer_block + BKPINFO_LOC_OFFSET), (void *) bkpinfo, sizeof(struct s_bkpinfo));
     pvp = &vp;
     vp = (void *) result_str;
@@ -1310 +1309 @@
                        "Please wait. This may take a couple of hours.",
                        "Working...",
-                       get_last_filelist_number() + 1);
+                       (long)get_last_filelist_number() + 1L);
 
     log_msg(5, "We're gonna party like it's your birthday.");