Changeset 3148 in MondoRescue for branches/3.1/mondo/src/mondorestore

Timestamp:

Jun 19, 2013, 8:50:28 AM (11 years ago)

Author:

Bruno Cornec

Message:

2nd phase for svn merge -r 2935:3146 ../3.0

Location:

branches/3.1/mondo/src/mondorestore

Files:

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

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

@@ -1421 +1421 @@
     char *tmp1 = NULL;
     char *tmp1 = NULL;
+    char *tmp1 = NULL;
 
     /** end *************************************************************/
@@ -2263 +2264 @@
     } else if (strcmp(format, "btrfs") == 0) {
               strcpy(program, "mkfs.btrfs");
+    } else if (strcmp(format, "btrfs") == 0) {
+              strcpy(program, "mkfs.btrfs");
     } else if (strcmp(format, "minix") == 0) {
         mr_asprintf(program, "mkfs.minix");

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

@@ -80 +80 @@
 char *incoming = NULL;
 char *question = NULL;
+char *q;
 char *q;
 
@@ -1399 +1400 @@
     bool done;
     int res = 0;        /*  FALSE */
+    bool mntlistchg = FALSE;
+    FILE *fin = NULL;
     bool mntlistchg = FALSE;
     FILE *fin = NULL;
@@ -1877 +1880 @@
     char *incoming = NULL;
     char *q;
+    char *q;
 
     assert_string_is_neither_NULL_nor_zerolength(output_file);