Changeset 3161 in MondoRescue for branches/3.1/mondo/src/common/libmondo-devices.c

Timestamp:

Jun 25, 2013, 10:53:14 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Apply fixes to 3.1 tree so that at least mondo compiles again (but that branch probably doesn't work at all again).

File:

• branches/3.1/mondo/src/common/libmondo-devices.c (modified) (10 diffs)

branches/3.1/mondo/src/common/libmondo-devices.c

@@ -330 +330 @@
     char *incoming = NULL;
     char *searchstr = NULL;
-    char *tmp = NULL;
-    char *p;
-    char *p;
 
     /*@ ints ******************************************************* */
@@ -339 +336 @@
     /*@ pointers *************************************************** */
     FILE *fin;
-
 
     /*@ end vars *************************************************** */
@@ -354 +350 @@
     mr_free(program);
     return (res);
-#else
-    /* To avoid compiler warnings */
-    tmp = NULL;
 #endif
 
@@ -984 +977 @@
     char *command = NULL;
     char *format_sz = NULL;
-    char *p;
-    char *p;
 
     FILE *pin;
@@ -2032 +2023 @@
                     mr_strcat(bkpinfo->exclude_paths,"|%s",mounted_on_dsf);
                 } else {
-                    mr_asprintf(&(bkpinfo->exclude_paths),"%s",mounted_on_dsf);
+                    mr_asprintf(bkpinfo->exclude_paths,"%s",mounted_on_dsf);
                 }
                 if (bkpinfo->exclude_devs) {
                     mr_strcat(bkpinfo->exclude_devs,"|%s",token);
                 } else {
-                    mr_asprintf(&(bkpinfo->exclude_devs),"%s",token);
+                    mr_asprintf(bkpinfo->exclude_devs,"%s",token);
                 }
             }
@@ -2052 +2043 @@
                     mr_strcat(bkpinfo->exclude_paths, "|%s",not_mounted_on_dsf);
                 } else {
-                    mr_asprintf(&(bkpinfo->exclude_paths),"%s",not_mounted_on_dsf);
+                    mr_asprintf(bkpinfo->exclude_paths,"%s",not_mounted_on_dsf);
                 }
             }
@@ -2065 +2056 @@
         /*  Adds a | to ensure correct detection even at both ends */
         mr_asprintf(tmp1,"|%s",token);
-        mr_asprintf(&tmp2,"|%s|",token);
+        mr_asprintf(tmp2,"|%s|",token);
         if (mode == 'E') {
             /*  Add the token if not already in the list */
@@ -2984 +2975 @@
 
         }
-<<<<<<< .courant
         p = popup_and_get_string("Network protocol", "Which Network protocol should I use (nfs/sshfs/smbfs) ?", bkpinfo->netfs_proto);
         if (p == NULL) {
@@ -3006 +2996 @@
             strcpy(tmp1, "");
         }
-        if (!popup_and_get_string
-            ("Network user", "Which user should I use if any ?",
-             tmp1, MAX_STR_LEN)) {
+        if (!popup_and_get_string("Network user", "Which user should I use if any ?",tmp1)) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
@@ -3014 +3002 @@
         mr_free(bkpinfo->netfs_user);
         if (strcmp(tmp1, "") != 0) {
-            mr_asprintf(&(bkpinfo->netfs_user), "%s", tmp1);
+            mr_asprintf(bkpinfo->netfs_user, "%s", tmp1);
         }