Changeset 3116 in MondoRescue for branches/3.0/mondo/src/mondorestore

Timestamp:

May 7, 2013, 5:42:54 AM (11 years ago)

Author:

Bruno Cornec

Message:

r5277@localhost: bruno | 2013-05-07 01:22:17 +0200

• Fix a compiler issue with the new test-mrstresc and also most compiler warnings

Location:

branches/3.0/mondo/src/mondorestore

Files:

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

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

@@ -281 +281 @@
 char *mds = NULL;
 int retval = 0, i;
-bool already_mounted = FALSE;
 
 assert(bkpinfo != NULL);
@@ -307 +306 @@
 if (is_this_device_mounted(g_isodir_device)) {
     log_to_screen("WARNING - isodir is already mounted");
-    already_mounted = TRUE;
 } else {
     mr_asprintf(&mount_isodir_command, "mount %s", g_isodir_device);
@@ -1027 +1025 @@
         "Filelist and biggielist already recovered from media. Yay!");
 } else {
-    getcwd(tmp, MAX_STR_LEN);
+    if (getcwd(tmp, MAX_STR_LEN) == NULL) {
+        // FIXME
+    }
     if (chdir(bkpinfo->tmpdir)) {
         // FIXME

branches/3.0/mondo/src/mondorestore/mondorestore.c

@@ -2421 +2421 @@
                                       &ctrl_chr);
     if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
-        res =
-            read_EXAT_files_from_tape(&biggie_size, biggie_fname,
+        res = read_EXAT_files_from_tape(&biggie_size, biggie_fname,
                                       &ctrl_chr, xattr_fname, acl_fname);
     }
@@ -2613 +2612 @@
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
             log_it("Reading EXAT files from tape");
-            res =
-                read_EXAT_files_from_tape(&tmp_size, tmp_fname,
+            res = read_EXAT_files_from_tape(&tmp_size, tmp_fname,
                                           &ctrl_chr, xattr_fname,
                                           acl_fname);