Changeset 3380 in MondoRescue for branches/3.2/mondo

Timestamp:

May 6, 2015, 11:57:35 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Do not use a \n with log_msg (ease debug with 99)

Location:

branches/3.2/mondo/src

Files:

• common/libmondo-archive.c (modified) (1 diff)
• common/libmondo-cli.c (modified) (2 diffs)
• common/libmondo-devices.c (modified) (2 diffs)
• common/libmondo-filelist.c (modified) (4 diffs)
• common/libmondo-raid.c (modified) (8 diffs)
• common/libmondo-verify.c (modified) (4 diffs)
• mondoarchive/mondoarchive.c (modified) (1 diff)
• mondorestore/mondo-prep.c (modified) (1 diff)
• mondorestore/mondorestore.c (modified) (2 diffs)

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

@@ -2848 +2848 @@
     fout = fopen(tmp, "w");
     if (fout == NULL) {
-        log_msg(1, "Unable to open and write to %s\n", tmp);
+        log_msg(1, "Unable to open and write to %s", tmp);
         mr_free(tmp);
         mr_free(suffix);

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

@@ -121 +121 @@
     log_msg(3, "media_size = %ld", bkpinfo->media_size);
     if (bkpinfo->media_size <= 0) {
-        log_msg(1, "You gave media an invalid size %s\n", value);
+        log_msg(1, "You gave media an invalid size %s", value);
         return (-1);
     }
@@ -999 +999 @@
 void help_screen()
 {
-    log_msg(1, "Type 'man mondoarchive' for more information\n");
+    log_msg(1, "Type 'man mondoarchive' for more information");
     exit(1);
 }

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

@@ -135 +135 @@
 
     mr_asprintf(tmp, "%s", where_is_root_mounted());
-    log_msg(0, "root is mounted at %s\n", tmp);
+    log_msg(0, "root is mounted at %s", tmp);
     log_msg(0, "That doesn't mean %s is the root partition. It's just a debugging message. Relax. It's part of am_I_in_disaster_recovery_mode().", tmp);
 
@@ -2880 +2880 @@
 
     mr_asprintf(exclude_these_directories,"%s", call_program_and_get_last_line_of_output("mount -t coda,ncpfs,fuse.sshfs,nfs,nfs4,vmhgfs,smbfs,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' '|' | awk '{print $0;}'"));
-    log_msg(9,"list_of_NETFS_mounts_only returns %s\n",exclude_these_directories);
+    log_msg(9,"list_of_NETFS_mounts_only returns %s",exclude_these_directories);
     return(exclude_these_directories);
 }

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

@@ -276 +276 @@
         }
         if (siz > g_max_biggie_size) {
-            log_msg(10, "Adding %s to big files (size = %ld)\n", incoming, siz);
+            log_msg(10, "Adding %s to big files (size = %ld)", incoming, siz);
             fprintf(fbig, "%s\n", incoming);
         } else {
             curr_set_size += siz;
-            log_msg(10, "Adding %s to filelist %d (size = %ld)\n", incoming, curr_set_no, siz);
+            log_msg(10, "Adding %s to filelist %d (size = %ld)", incoming, curr_set_no, siz);
             fprintf(fout, "%s\n", incoming);
             if (curr_set_size > maxsetsizeK) {
@@ -462 +462 @@
         mr_asprintf(syscall, "%s '%s' 2>> /dev/null", syscall_sprintf, tmp);    // " MONDO_LOGFILE);
         mr_free(tmp);
-        log_msg(20,"calling %s\n",syscall);
+        log_msg(20,"calling %s",syscall);
         call_exe_and_pipe_output_to_fd(syscall, pout);
         mr_free(syscall);
@@ -608 +608 @@
 
         i = strcmp(p, q);
-        log_msg(my_depth, "'%s' v '%s' --> %d\n", p, q, i);
+        log_msg(my_depth, "'%s' v '%s' --> %d", p, q, i);
 
 //      printf("%s v %s --> %d\n", p, q, i);
 
         if (i < 0) {            // read another subset file in.
-            log_msg(my_depth, "Reading next subset line in\n\n");
+            log_msg(my_depth, "Reading next subset line in");
             mr_free(current_subset_file);
             mr_getline(current_subset_file, faclin);
@@ -947 +947 @@
 
     if (!node->ch) {
-        log_msg(0, "%s\n", current_string);
+        log_msg(0, "%s", current_string);
     }
 

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

@@ -712 +712 @@
             raidrec->parity = 3;
         } else {
-            log_msg(1, "Unknown RAID parity algorithm '%s'\n.", value);
+            log_msg(1, "Unknown RAID parity algorithm '%s'", value);
         }
         log_msg(4,"Found raid parity %d",raidrec->parity);
@@ -976 +976 @@
 // open file
 if (!(fin = fopen(mdstat_fname, "r"))) {
-    log_msg(1, "Could not open %s.\n", mdstat_fname);
+    log_msg(1, "Could not open %s.", mdstat_fname);
     return 1;
 }
@@ -989 +989 @@
 while ( !feof_unlocked(fin) ) {
     res = getline(&string, &len, fin);
-    log_msg(8, "mdstat line '%s' read.\n", string);
+    log_msg(8, "mdstat line '%s' read.", string);
     if (res <= 0) break;
     // trim spaces
     strip_spaces(string);
-    log_msg(8, "mdstat line 2 '%s' read.\n", string);
+    log_msg(8, "mdstat line 2 '%s' read.", string);
     // if we have newline after only spaces, this is a blank line, update
     // counters, otherwise do normal parsing
@@ -1004 +1004 @@
         case 1:  // device information
             // check whether last line of record and if so skip
-            log_msg(8, "This is the device line\n");
+            log_msg(8, "This is the device line");
             pos = strcasestr(string, "unused devices: ");
             if (pos != NULL) {
@@ -1050 +1050 @@
             }
             if (!strcmp(token, "inactive")) {
-                log_msg(1, "RAID device '%s' inactive.\n", raidlist->el[raidlist->entries].raid_device);
+                log_msg(1, "RAID device '%s' inactive.", raidlist->el[raidlist->entries].raid_device);
                 mr_free(string);
                 mr_free(token);
@@ -1089 +1089 @@
                 raidlist->el[raidlist->entries].raid_level = 10;
             } else {
-                log_msg(1, "Unknown RAID level '%s'.\n", token);
+                log_msg(1, "Unknown RAID level '%s'", token);
                 mr_free(string);
                 mr_free(token);
@@ -1133 +1133 @@
                     break;
                 default: // error
-                    log_msg(1, "Unknown device type '%c'\n", type);
+                    log_msg(1, "Unknown device type '%c'", type);
                     mr_free(string);
                     mr_free(token);
@@ -1227 +1227 @@
             if (raidlist->el[raidlist->entries].progress != -1 &&
                 raidlist->el[raidlist->entries].progress != 999) {
-                log_msg(1, "Row %d should not occur in record!\n", row);
+                log_msg(1, "Row %d should not occur in record!", row);
             }
             break;

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

@@ -952 +952 @@
 
     sync();
-    log_msg(2, "OK, I've mounted the USB Disk/Key\n");
+    log_msg(2, "OK, I've mounted the USB Disk/Key");
     mr_asprintf(tmp, "%s/archives/NOT-THE-LAST", mountpoint);
     if (!does_file_exist(tmp)) {
@@ -982 +982 @@
         retval++;
     } else {
-        log_msg(2, "OK, I've unmounted the USB device\n");
+        log_msg(2, "OK, I've unmounted the USB device");
     }
     mr_free(tmp1);
@@ -1080 +1080 @@
         mr_free(command);
     }
-    log_msg(2, "OK, I've mounted the ISO/CD\n");
+    log_msg(2, "OK, I've mounted the ISO/CD");
     mr_asprintf(tmp, "%s/archives/NOT-THE-LAST", mountpoint);
     if (!does_file_exist(tmp)) {
@@ -1113 +1113 @@
         retval++;
     } else {
-        log_msg(2, "OK, I've unmounted the ISO file\n");
+        log_msg(2, "OK, I've unmounted the ISO file");
     }
     mr_free(mountpoint);

branches/3.2/mondo/src/mondoarchive/mondoarchive.c

@@ -275 +275 @@
 #define MDSTAT_FILE "/tmp/mdstat"
         if (!(fin = fopen(MDSTAT_FILE, "r"))) {
-            log_msg(1, "Could not open %s.\n", MDSTAT_FILE);
+            log_msg(1, "Could not open %s.", MDSTAT_FILE);
                 finish(1);
         }

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

@@ -604 +604 @@
 log_msg(4, "cmd built: %s", program);
 mr_strcat(program, " %s", devices);
-log_msg(2, "RAID device re-created with the following command:\n%s\n", program);
+log_msg(2, "RAID device re-created with the following command:\n%s", program);
 if (test == TRUE) {
     res = run_program_and_log_output(program, 1);

branches/3.2/mondo/src/mondorestore/mondorestore.c

@@ -397 +397 @@
             g_current_media_number++;
             mds = media_descriptor_string(bkpinfo->backup_media_type);
-            log_msg(2, "Asking for %s #%d so that I may read slice #%ld\n", mds, g_current_media_number, sliceno);
+            log_msg(2, "Asking for %s #%d so that I may read slice #%ld", mds, g_current_media_number, sliceno);
             mr_free(mds);
 
@@ -1359 +1359 @@
     if (current_bigfile_number != noof_biggiefiles
         && noof_biggiefiles != 0) {
-        log_msg(1, "Warning - bigfileno=%ld but noof_biggiefiles=%ld\n", current_bigfile_number, noof_biggiefiles);
+        log_msg(1, "Warning - bigfileno=%ld but noof_biggiefiles=%ld", current_bigfile_number, noof_biggiefiles);
     } else {
         log_msg(1, "%ld biggiefiles in biggielist.txt; %ld biggiefiles processed today.", noof_biggiefiles, current_bigfile_number);