Changeset 3611 in MondoRescue for branches/3.2/mondo/src/common/libmondo-stream.c

Timestamp:

Nov 10, 2016, 9:09:54 PM (7 years ago)

Author:

Bruno Cornec

Message:

Remove more static allocation

File:

• branches/3.2/mondo/src/common/libmondo-stream.c (modified) (5 diffs)

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

@@ -1177 +1177 @@
     /*@ buffers ***************************************************** */
     char *tempblock;
+    char *tmp = NULL;
 
     /*@ int ********************************************************* */
@@ -1208 +1209 @@
     }
     tempblock[i] = '\0';
-    log_msg(6, "%s (fname=%s, size=%ld K)",
-            marker_to_string(*pcontrol_char), tempblock + 1000,
-            (long) (*plen) >> 10);
+    tmp = marker_to_string(*pcontrol_char);
+    log_msg(6, "%s (fname=%s, size=%ld K)", tmp, tempblock + 1000, (long) (*plen) >> 10);
+    mr_free(tmp);
     paranoid_free(tempblock);
     return (retval);
@@ -1751 +1752 @@
     char tempblock[TAPE_BLOCK_SIZE];
     char *p;
+    char *tmp = NULL;
 
     /*@ int ******************************************************** */
@@ -1782 +1784 @@
     strcpy(tempblock + 1000, filename);
     g_tape_posK += fwrite(tempblock, 1, (size_t) TAPE_BLOCK_SIZE, g_tape_stream) / 1024;
-    log_msg(6, "%s (fname=%s, size=%ld K)", marker_to_string(control_char), p, (long) length_of_incoming_file >> 10);
+    tmp = marker_to_string(control_char);
+    log_msg(6, "%s (fname=%s, size=%ld K)", tmp, p, (long) length_of_incoming_file >> 10);
+    mr_free(tmp);
     return (0);
 }
@@ -1802 +1806 @@
 void wrong_marker(int should_be, int it_is)
 {
-    log_to_screen("Wrong marker! (Should be %s, is actually %s)", marker_to_string(should_be), marker_to_string(it_is));
+    char *tmp1 = NULL;
+    char *tmp2 = NULL;
+    tmp1 =  marker_to_string(should_be);
+    tmp2 =  marker_to_string(it_is);
+    log_to_screen("Wrong marker! (Should be %s, is actually %s)", tmp1, tmp2);
+    mr_free(tmp1);
+    mr_free(tmp2);
 }