Changeset 3831 in MondoRescue for branches/3.3/mondo/src/mondorestore/mondorestore.c

Timestamp:

Mar 4, 2024, 5:47:08 PM (2 months ago)

Author:

Bruno Cornec

Message:

Fix compilation warnings

File:

• branches/3.3/mondo/src/mondorestore/mondorestore.c (modified) (4 diffs)

branches/3.3/mondo/src/mondorestore/mondorestore.c

@@ -23 +23 @@
 
 extern void wait_until_software_raids_are_prepped(char *, int);
+extern char *mr_popup_and_get_string(char *, char *, char *);
 
 extern void twenty_seconds_til_yikes(void);
@@ -1991 +1992 @@
                 gotos_suck:
                 // (NB: MNT_RESTORING is where your filesystem is mounted now, by default)
-                tmp = mr_popup_and_get_string("Restore path", "Restore files to where?", old_restpath);
-                if (tmp != NULL) {
-                    if (!strcmp(tmp, "/")) {
+                tmp1 = mr_popup_and_get_string("Restore path", "Restore files to where?", old_restpath);
+                if (tmp1 != NULL) {
+                    if (!strcmp(tmp1, "/")) {
                         if (!ask_me_yes_or_no("Are you sure?")) {
-                            mr_free(tmp);
+                            mr_free(tmp1);
                             goto gotos_suck;
                         }
-                        mr_asprintf(tmp, "%s", ""); // so we restore to [blank]/file/name :)
+                        mr_free(tmp1);
+                        mr_asprintf(tmp1, "%s", "");    // so we restore to [blank]/file/name :)
                     }
-                    mr_asprintf(bkpinfo->restore_path, "%s", tmp);
+                    mr_asprintf(bkpinfo->restore_path, "%s", tmp1);
                     log_msg(1, "Restoring subset");
                     retval += restore_everything(filelist);
@@ -2007 +2009 @@
                     mr_asprintf(bkpinfo->restore_path, "%s", old_restpath);
                 }
+                mr_free(tmp1);
                 free_filelist(filelist);
                 if (!ask_me_yes_or_no("Restore another subset of your backup?")) {
@@ -2064 +2067 @@
                             "Warning - errors occurred during the restore phase.");
     }
-  end_of_func:
     log_it("Leaving interactive_mode()");
     return (retval);