Changeset 2324 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-files.c

Timestamp:

Aug 18, 2009, 3:13:54 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3335@localhost: bruno | 2009-08-08 23:04:12 +0200

• Change mr_asprintf to avoid the need of pointer and be consistent with the other mr_mem functions

File:

• branches/2.2.10/mondo/src/common/libmondo-files.c (modified) (17 diffs)

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

@@ -48 +48 @@
     static char output[MAX_STR_LEN];
     char *command = NULL;
-    char *tmp = NULL;
 
     /*@ pointers **************************************************** */
@@ -71 +70 @@
         mr_free(command);
     } else {
-        mr_asprintf(tmp, "File '%s' not found; cannot calc checksum", filename);
-        log_it(tmp);
-        mr_free(tmp);
+        log_it("File '%s' not found; cannot calc checksum", filename);
     }
     if (p) {
@@ -129 +126 @@
     char *command = NULL;
     char incoming[MAX_STR_LEN];
-    char *tmp = NULL;
 
     /*@ long ******************************************************** */
@@ -142 +138 @@
     assert_string_is_neither_NULL_nor_zerolength(filename);
     if (!does_file_exist(filename)) {
-        mr_asprintf(tmp, "%s does not exist, so I cannot found the number of lines in it", filename);
-        log_it(tmp);
-        mr_free(tmp);
+        log_it("%s does not exist, so I cannot found the number of lines in it", filename);
         return (0);
     }
@@ -251 +245 @@
             fprintf(fout, "%s\n", incoming);
         } else {
-            mr_asprintf(tmp, "Excluding '%s'-nonexistent\n", incoming);
-            log_it(tmp);
-            mr_free(tmp);
+            log_it("Excluding '%s'-nonexistent\n", incoming);
         }
     }
@@ -354 +346 @@
         }
         mr_asprintf(command, "file %s 2> /dev/null | cut -d':' -f1 2> /dev/null", incoming);
-        strcpy(incoming,
-               call_program_and_get_last_line_of_output(command));
+        strcpy(incoming, call_program_and_get_last_line_of_output(command));
         mr_free(command);
     }
@@ -361 +352 @@
     {
         mr_asprintf(command, "dirname %s 2> /dev/null", incoming);
-        strcpy(incoming,
-               call_program_and_get_last_line_of_output(command));
+        strcpy(incoming, call_program_and_get_last_line_of_output(command));
         mr_free(command);
     }
@@ -453 +443 @@
     if (i < 0) {
         mr_asprintf(command, "tail -n3 %s | grep -Fi \"%c\" | tail -n1 | awk '{print $0;}'", filename, '%');
-        strcpy(lastline,
-               call_program_and_get_last_line_of_output(command));
+        strcpy(lastline, call_program_and_get_last_line_of_output(command));
         mr_free(command);
         if (!lastline[0]) {
@@ -495 +484 @@
     static char output[MAX_STR_LEN];
     char *command = NULL;
-    char *tmp = NULL;
 
     /*@ pointers **************************************************** */
@@ -503 +491 @@
 
     if (!does_file_exist(filename)) {
-        mr_asprintf(tmp, "Tring to get last line of nonexistent file (%s)", filename);
-        log_it(tmp);
-        mr_free(tmp);
+        log_it("Tring to get last line of nonexistent file (%s)", filename);
         output[0] = '\0';
         return (output);
@@ -618 +604 @@
                 /*              printf("%0d%% done      \r",percentage); */
             } else {
-                time_remaining =
-                    time_taken * 100 / (long) (percentage) - time_taken;
-                mr_asprintf(tmp, "%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s\r", percentage, (int) (time_taken / 60), (int) (time_taken % 60), (int) (time_remaining / 60), (int) (time_remaining % 60), curr_fname);
-                log_to_screen(tmp);
-                mr_free(tmp);
+                time_remaining = time_taken * 100 / (long) (percentage) - time_taken;
+                log_to_screen("%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s\r", percentage, (int) (time_taken / 60), (int) (time_taken % 60), (int) (time_remaining / 60), (int) (time_remaining % 60), curr_fname);
             }
             sync();
@@ -820 +803 @@
                 log_msg(4, "%s --> %ld K", fname, file_len_K);
             }
-            mr_asprintf(comment, "After adding %s, scratchL+%ld now equals %ld", fname, file_len_K, scratchL);
-            log_msg(4, comment);
-            mr_free(comment);
+            log_msg(4, "After adding %s, scratchL+%ld now equals %ld", fname, file_len_K, scratchL);
             if (feof(fin)) {
                 break;
@@ -920 +901 @@
     /*@ buffers *** */
     char *command = NULL;
-    char *errorstr = NULL;
     int res = 0;
 
@@ -928 +908 @@
 
     if (res) {
-        mr_asprintf(errorstr, "Please install '%s'. I cannot find it on your system.", fname);
-        log_to_screen(errorstr);
-        mr_free(errorstr);
+        log_to_screen("Please install '%s'. I cannot find it on your system.", fname);
         log_to_screen("There may be hyperlink at http://www.mondorescue.com which");
         log_to_screen("will take you to the relevant (missing) package.");
@@ -1031 +1009 @@
     char *command = NULL;
     char tmp[MAX_STR_LEN];
-    char old_pwd[MAX_STR_LEN];
     int res = 0;
 
@@ -1124 +1101 @@
     p = strchr(tmp, ':');
     if (!p) {
-        fatal_error
-            ("NFS mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
+        fatal_error("NFS mount doesn't have a colon in it, e.g. 192.168.1.4:/home/nfs");
     }
     *(p++) = '\0';
@@ -1229 +1205 @@
 
 
-
-
-
-
 /**
  * Determine the approximate number of media that the backup will take up,