Changeset 3042 in MondoRescue

Timestamp:

Oct 7, 2012, 8:44:28 PM (12 years ago)

Author:

Bruno Cornec

Message:

• Fix some compilations warnings and 1 error

Location:

branches/3.0/mondo

Files:

• src/common/libmondo-fork.c (modified) (5 diffs)
• src/common/libmondo-string-EXT.h (modified) (1 diff)
• src/common/libmondo-string.c (modified) (1 diff)
• src/common/libmondo-string.h (modified) (1 diff)
• src/common/libmondo-tools.c (modified) (1 diff)
• src/mondorestore/mondoprep.h (modified) (1 diff)
• test/test-truncname.c (modified) (1 diff)

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

@@ -261 +261 @@
     /*@ int ********************************************************* */
     int res;
-    int i;
-    int len;
     bool log_if_failure = FALSE;
     bool log_if_success = FALSE;
@@ -285 +283 @@
         log_if_failure = TRUE;
     }
-    mr_asprintf(callstr, "%s > %s/mondo-run-prog-thing.tmp 2> %s/mondo-run-prog-thing.err", program, bkpinfo->tmpdir, bkpinfo->tmpdir);
+    mr_asprintf(&callstr, "%s > %s/mondo-run-prog-thing.tmp 2> %s/mondo-run-prog-thing.err", program, bkpinfo->tmpdir, bkpinfo->tmpdir);
     while ((p = strchr(callstr, '\r'))) {
         *p = ' ';
@@ -294 +292 @@
 
 
-    len = (int) strlen(program);
-    for (i = 0; i < 35 - len / 2; i++) {
-        tmp[i] = '-';
-    }
-    tmp[i] = '\0';
-    strcat(tmp, " ");
-    strcat(tmp, program);
-    strcat(tmp, " ");
-    for (i = 0; i < 35 - len / 2; i++) {
-        strcat(tmp, "-");
-    }
-    strcpy(initial_label, tmp);
     res = system(callstr);
     if (((res == 0) && log_if_success) || ((res != 0) && log_if_failure)) {
@@ -313 +299 @@
     mr_free(callstr);
 
-    mr_asprintf(callstr, "cat %s/mondo-run-prog-thing.err >> %s/mondo-run-prog-thing.tmp 2> /dev/null", bkpinfo->tmpdir, bkpinfo->tmpdir);
+    mr_asprintf(&callstr, "cat %s/mondo-run-prog-thing.err >> %s/mondo-run-prog-thing.tmp 2> /dev/null", bkpinfo->tmpdir, bkpinfo->tmpdir);
     if (log_if_failure && system(callstr)) {
         log_OS_error("Command failed");
@@ -319 +305 @@
     mr_free(callstr);
 
-    mr_asprintf(tmp1, "%s/mondo-run-prog-thing.err", bkpinfo->tmpdir);
+    mr_asprintf(&tmp1, "%s/mondo-run-prog-thing.err", bkpinfo->tmpdir);
     unlink(tmp1);
     mr_free(tmp1);
 
-    mr_asprintf(tmp1, "%s/mondo-run-prog-thing.tmp", bkpinfo->tmpdir);
+    mr_asprintf(&tmp1, "%s/mondo-run-prog-thing.tmp", bkpinfo->tmpdir);
     fin = fopen(tmp1, "r");
     if (fin) {

branches/3.0/mondo/src/common/libmondo-string-EXT.h

@@ -25 +25 @@
 extern void strip_spaces(char *in_out);
 extern char *trim_empty_quotes(char *incoming);
-extern char *truncate_to_drive_name(char *partition);
+extern char *truncate_to_drive_name(const char *partition);
 extern char *turn_raid_level_number_to_string(int raid_level);
 

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

@@ -811 +811 @@
  * @return @p partition.
  */
-char *truncate_to_drive_name(char *partition)
+char *truncate_to_drive_name(const char *partition)
 {
     int i = strlen(partition) - 1;

branches/3.0/mondo/src/common/libmondo-string.h

@@ -21 +21 @@
 void strip_spaces(char *in_out);
 char *trim_empty_quotes(char *incoming);
-char *truncate_to_drive_name(char *partition);
+char *truncate_to_drive_name(const char *partition);
 char *turn_raid_level_number_to_string(int raid_level);
 void printf_silly_message(void);

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

@@ -647 +647 @@
                 colon++;
                 hent = gethostbyname(colon);
-                mr_asprintf(bkpinfo->netfs_user,"%s", hostname);
+                mr_asprintf(&(bkpinfo->netfs_user),"%s", hostname);
             } else {
                 hent = gethostbyname(hostname);

branches/3.0/mondo/src/mondorestore/mondoprep.h

@@ -82 +82 @@
 
 
-char *truncate_to_drive_name(char *partition);
+char *truncate_to_drive_name(const char *partition);
 void create_mountlist_for_drive(struct mountlist_itself *mountlist,
                                 char *drive_name,

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

@@ -41 +41 @@
 
 extern char *MONDO_LOGFILE;
-extern char *truncate_to_drive_name(char *);
+extern char *truncate_to_drive_name(const char *);
 /* We don't have a cleanup function yet */
 void (*mr_cleanup)(void) = NULL;