Changeset 2229 in MondoRescue

Timestamp:

Jun 17, 2009, 8:42:12 PM (15 years ago)

Author:

Bruno Cornec

Message:

Fix various multiple compile bugs/warnings around log_it, opt flags and mr_asprintf

Location:

branches/2.2.9/mondo/src

Files:

• common/libmondo-cli.c (modified) (2 diffs)
• common/libmondo-stream.c (modified) (1 diff)
• mondorestore/mondorestore.c (modified) (1 diff)

branches/2.2.9/mondo/src/common/libmondo-cli.c

@@ -997 +997 @@
             p--;
             *p = '\0';
-            mr_asprintf(q,"%s",bkpinfo->nfs_mount);
+            mr_asprintf(&q,"%s",bkpinfo->nfs_mount);
             bkpinfo->nfs_user = q;
             strcpy(bkpinfo->nfs_mount,tmp);
@@ -1497 +1497 @@
             /*log_it("Invalid option: %c\n",optopt); */
         } else {
-            if (flag_set[optopt]) {
+            if (flag_set[opt]) {
                 bad_switches = TRUE;
                 mr_asprintf(&tmp, "Switch -%c previously defined as %s\n", opt,
-                        flag_val[i]);
+                        flag_val[opt]);
                 log_to_screen(tmp);
                 paranoid_free(tmp);

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

@@ -568 +568 @@
     }
     if (curr < 0) {
-        log_it("%s",
-            ("Not far enough into tape to start deleting old archives from collection.");
+        log_it("%s","Not far enough into tape to start deleting old archives from collection.");
         return (0);
     }

branches/2.2.9/mondo/src/mondorestore/mondorestore.c

@@ -2522 +2522 @@
             }
         } else {
-            log_it("%s",
-                ("No biggiefiles selected. So, no biggie-EXATs to set.");
+            log_it("%s","No biggiefiles selected. So, no biggie-EXATs to set.");
         }
     }