Changeset 3294 in MondoRescue for branches/3.2/mondo/src/common/libmondo-archive.c

Timestamp:

Jun 3, 2014, 8:20:52 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix a compilation issue in libmondo-archive.c on mindi call with lack of parameter
• Fix compilation warnings in mr_mem.c
• Adds function mr_str_substitute in mr_str (not yet used) and test code

File:

• branches/3.2/mondo/src/common/libmondo-archive.c (modified) (2 diffs)

branches/3.2/mondo/src/common/libmondo-archive.c

@@ -841 +841 @@
 6=\"%s\" 7=%ld 8=\"%s\" 9=\"%s\" 10=\"%s\" \
 11=\"%s\" 12=%s 13=%ld 14=\"%s\" 15=\"%s\" 16=\"%s\" 17=\"%s\" 18=%ld 19=%d",*/
-    mr_asprintf(command, "mindi %s --custom %s %s/images '%s' '%s' '%s' %ld '%s' '%s' '%s' '%s' %s %ld '%s' '%s' '%s' '%s' %ld %d '%s' '%s' 2>&1 > %s", 
+    mr_asprintf(command, 
+            "mindi %s --custom %s %s/images '%s' '%s' '%s' '%ld' '%s' '%s' '%s' '%s' '%s' '%ld' '%s' '%s' '%s' '%s' '%ld' '%d' '%s' '%s' 2>&1 > %s", 
+            //     1           2   3          4   5    6     7     8    9   10   11   12   13    14   15   16   17   18    19   20   21         23
             tmp2, 
             bkpinfo->tmpdir,    // parameter #2
@@ -864 +866 @@
             use_lzma_sz,        // parameter #20 (STRING)
             value,          // parameter #21 (STRING)
-            MONDO_LOGFILE,      // redirect to log file
+            MONDO_LOGFILE       // redirect to log file
             );