Changeset 3116 in MondoRescue

Timestamp:

May 7, 2013, 5:42:54 AM (12 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

Files:

• src/common/libmondo-stream.c (modified) (2 diffs)
• src/common/libmondo-verify.c (modified) (3 diffs)
• src/mondorestore/mondo-rstr-tools.c (modified) (3 diffs)
• src/mondorestore/mondorestore.c (modified) (2 diffs)
• test/test-mr_stresc.c (modified) (2 diffs)
• test/test-truncname.c (modified) (1 diff)

branches/3.0/mondo/src/common/libmondo-stream.c

@@ -373 +373 @@
     int res = 0;
     char fname_buf[PATH_MAX];
-    char *fname = (char *)fname_buf;                    /* Should NOT be NULL */
+    char *fname = (char *)fname_buf;        /* Should NOT be NULL */
     char *tmp = NULL;
 
@@ -430 +430 @@
     res = read_header_block_from_stream(ptmp_size, tmp_fname, pctrl_chr);
     log_msg(1, "End of extended attributes, now looking for afioball");
-    return (0);
+    return (res);
 }
 

branches/3.0/mondo/src/common/libmondo-verify.c

@@ -787 +787 @@
         log_it("Grabbing the EXAT files");
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
-            res =
-                read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
+            res = read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
                                           curr_xattr_list_fname,
                                           curr_acl_list_fname);
@@ -810 +809 @@
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
             log_it("Reading EXAT files from tape");
-            res =
-                read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
+            res = read_EXAT_files_from_tape(&size, fname, &ctrl_chr,
                                           curr_xattr_list_fname,
                                           curr_acl_list_fname);
@@ -900 +898 @@
         if (ctrl_chr == BLK_START_EXTENDED_ATTRIBUTES) {
             log_it("Grabbing the EXAT biggiefiles");
-            res =
-                read_EXAT_files_from_tape(&size, orig_fname,
+            res = read_EXAT_files_from_tape(&size, orig_fname,
                                           &ctrl_chr, curr_xattr_list_fname,
                                           curr_acl_list_fname);

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);

branches/3.0/mondo/test/test-mr_stresc.c

@@ -6 +6 @@
  */
 #include <stdio.h>
+#include <stdlib.h>
 #include "mr_str.h"
 
-const char **strl = {
+void (*mr_cleanup)(void) = NULL;
+
+char **strl = {
         "test with space",
         "test with \ backslash",
@@ -23 +26 @@
 const int MAX = 10;
 
-void main() {
+int main() {
 
         char *p;

branches/3.0/mondo/test/test-truncname.c

@@ -47 +47 @@
 }
 
-void main() {
+int main() {
 
 char *part = NULL;