Changeset 1188 in MondoRescue for trunk/mondo/src/mondoarchive/mondo-cli.c

Timestamp:

Feb 20, 2007, 3:03:55 AM (17 years ago)

Author:

Bruno Cornec

Message:

Stable merges again

File:

• trunk/mondo/src/mondoarchive/mondo-cli.c (modified) (4 diffs)

trunk/mondo/src/mondoarchive/mondo-cli.c

@@ -11 +11 @@
 
 #include "my-stuff.h"
-#include "../common/mondostructures.h"
+#include "mondostructures.h"
 #include "mondo-cli-EXT.h"
-#include "../common/libmondo.h"
+#include "libmondo.h"
 #ifndef S_SPLINT_S
 #include <pthread.h>
 #endif
 #include "mr_mem.h"
+#include "mr_msg.h"
+
+//static char cvsid[] = "$Id$";
 
 extern int g_loglevel;
@@ -23 +26 @@
 extern bool g_skip_floppies;    ///< Whether to skip the creation of boot disks
 extern bool g_cd_recovery;
-extern double g_kernel_version;
-extern char *resolve_softlinks_to_get_to_actual_device_file(char *);
 
 /**
@@ -63 +64 @@
     int res = 0;
     int retval = 0;
-    int i = 0, j;
+    int i = 0, j = 0;
 
     /*@ buffers *************** */
-    char *tmp;
+    char *tmp = NULL;
     char *flag_val[128];
     bool flag_set[128];
@@ -95 +96 @@
     for (i = 0; i < 128; i++) {
         if (flag_set[i]) {
-            mr_asprintf(&tmp, "-%c %s", i, flag_val[i]);
-            mr_msg(3, tmp);
-            mr_free(tmp);
+            mr_msg(3, "-%c %s", i, flag_val[i]);
         }
     }