Changeset 2836 in MondoRescue for branches/2.2.9

Timestamp:

Jun 25, 2011, 5:10:35 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Fix 485 by replacing a wrong call to mr_asprintf which was provoking core dumped.

Location:

branches/2.2.9

Files:

• mondo/src/common/libmondo-devices.c (modified) (2 diffs)
• tools/quality (modified) (1 diff)

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

@@ -2083 +2083 @@
                     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);
                 }
             }
@@ -2102 +2102 @@
                     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);
                 }
             }

branches/2.2.9/tools/quality

@@ -49 +49 @@
 cat /tmp/mondo.quality
 echo "mondorescue uses : `cat /tmp/mondo.quality | wc -l` mr_asprintf without \""
+pbg mr_asprintf | grep -vE '|mr_mem|quality|mr_asprintf\(&' > /tmp/mondo.quality
+cat /tmp/mondo.quality
+echo "mondorescue uses : `cat /tmp/mondo.quality | wc -l` mr_asprintf without &"
 echo " "
 echo "Splint: "