Changeset 2242 in MondoRescue for branches/2.2.9/mondo/src/mondorestore/mondo-rstr-compare.c

Timestamp:

Jun 29, 2009, 7:19:18 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3145@localhost: bruno | 2009-06-29 17:18:58 +0200

• Remove 2 memory leaks and change the behavoir for function media_descriptor_string which now allocates the string it returns (which needs to be free by the caller)

File:

• branches/2.2.9/mondo/src/mondorestore/mondo-rstr-compare.c (modified) (4 diffs)

branches/2.2.9/mondo/src/mondorestore/mondo-rstr-compare.c

@@ -382 +382 @@
 
     char *tarball_fname, *progress_str, *tmp;
+    char *mds = NULL;
     long max_val;
 
@@ -393 +394 @@
 
     max_val = atol(tmp);
-    sprintf(progress_str, "Comparing with %s #%d ",
-            media_descriptor_string(bkpinfo->backup_media_type),
-            g_current_media_number);
+    mds = media_descriptor_string(bkpinfo->backup_media_type);
+    sprintf(progress_str, "Comparing with %s #%d ", mds, g_current_media_number);
 
     open_progress_form("Comparing files",
@@ -440 +440 @@
             log_msg(2, "OK, I think it's time for another CD...");
             g_current_media_number++;
-            sprintf(progress_str, "Comparing with %s #%d ",
-                    media_descriptor_string(bkpinfo->backup_media_type),
-                    g_current_media_number);
+            sprintf(progress_str, "Comparing with %s #%d ", mds, g_current_media_number);
             log_to_screen(progress_str);
         } else {
@@ -451 +449 @@
         }
     }
+    mr_free(mds);
+
     close_progress_form();
     if (retval) {