Changeset 2282 in MondoRescue

Timestamp:

Jul 20, 2009, 12:41:46 AM (16 years ago)

Author:

Bruno Cornec

Message:

r3279@localhost: bruno | 2009-07-20 00:29:15 +0200
Fix mondo compilation and link

Location:

branches/2.2.10/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (1 diff)
• mondo-rstr-tools.c (modified) (3 diffs)

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

@@ -921 +921 @@
 
     assert(mountlist != NULL);
-    Mr_asprintf(&tmp, "format_everything (mountlist, interactively = %s",
+    mr_asprintf(&tmp, "format_everything (mountlist, interactively = %s",
             (interactively) ? "true" : "false");
     log_it(tmp);

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -232 +232 @@
 mr_asprintf(&command, "grep -E '^%s$' %s", file, list_fname);
 res = run_program_and_log_output(command, FALSE);
-mt_free(command);
+mr_free(command);
 paranoid_free(file);
 mr_free(tmp);
@@ -1351 +1351 @@
   /** malloc *******/
     char *device;
-    char *tmp = NULL;
     char *name;
     char *cmd = NULL;
@@ -2197 +2196 @@
 
     mr_asprintf(&cfg_file, "%s/%s", bkpinfo->tmpdir, MONDO_CFG_FILE_STUB);
-    mr_asprintf(^mountlist_file, "%s/%s", bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
+    mr_asprintf(&mountlist_file, "%s/%s", bkpinfo->tmpdir, MOUNTLIST_FNAME_STUB);
     log_msg(2, "mountpt = %s; cfg_file=%s", mountpt, cfg_file);
     mr_free(mountpt);