Changeset 1378 in MondoRescue for branches/stable/mondo/src/mondoarchive

Timestamp:

Apr 30, 2007, 3:14:47 PM (18 years ago)

Author:

Bruno Cornec

Message:

Fixes for merges

Location:

branches/stable/mondo/src/mondoarchive

Files:

• mondo-cli.c (modified) (2 diffs)
• mondoarchive.c (modified) (2 diffs)

branches/stable/mondo/src/mondoarchive/mondo-cli.c

@@ -79 +79 @@
     int res = 0;
     int retval = 0;
-    int i = 0, j = 0;
+    int i = 0;
 
     /*@ buffers *************** */
@@ -145 +145 @@
 int process_the_s_switch(struct s_bkpinfo *bkpinfo, char *value)
 {
-    int j;
     char *tmp = NULL;
     char *p = NULL;

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -20 +20 @@
 #include "mondostructures.h"
 #include "libmondo.h"
+#include "libmondo-tools.h"
 #include "mondo-cli-EXT.h"
 
@@ -69 +70 @@
 
     mr_msg(0, "Mondo Archive v%s --- http://www.mondorescue.org", PACKAGE_VERSION);
-    log_msg(0, "running %s binaries", get_architecture());
+    mr_msg(0, "running %s binaries", get_architecture());
     tmp = get_uname_m();
-    log_msg(0, "running on %s architecture", tmp);
+    mr_msg(0, "running on %s architecture", tmp);
     mr_free(tmp);
     mr_msg(0, "-----------------------------------------------------------");