Changeset 2323 in MondoRescue for branches/2.2.10/mondo/src/lib

Timestamp:

Aug 18, 2009, 3:05:43 PM (16 years ago)

Author:

Bruno Cornec

Message:

r3334@localhost: bruno | 2009-08-08 12:17:37 +0200

• Change mr_asprintf interface to pass only the char * (makes bkpinfo usage more easy)

File:

• branches/2.2.10/mondo/src/lib/mr_conf.c (modified) (6 diffs)

branches/2.2.10/mondo/src/lib/mr_conf.c

@@ -108 +108 @@
     CONF = fopen(filename, "r");
 
-    mr_asprintf(&mr_conf_filename, "%s", filename);
+    mr_asprintf(mr_conf_filename, "%s", filename);
 
     /*if file is empty or not exist => error */
@@ -198 +198 @@
     p = mr_conf_read(field_name);
     if (p != NULL) {
-        mr_asprintf(&p1, "%d", p);
+        mr_asprintf(p1, "%d", p);
         }
     return p1;
@@ -210 +210 @@
     p = mr_conf_read(field_name);
     if (p != NULL) {
-        mr_asprintf(&p1, "%f", p);
+        mr_asprintf(p1, "%f", p);
     }
     return p1;
@@ -232 +232 @@
         return(p);
     }
-    mr_asprintf(&q, "%s", p);
+    mr_asprintf(q, "%s", p);
 
     if (*p != '"') {
@@ -275 +275 @@
             (strncasecmp(p, "t" , (size_t)1) == 0) ||
             (strncasecmp(p, "1" , (size_t)1) == 0)) {
-            mr_asprintf(&p1, "%d", TRUE);
+            mr_asprintf(p1, "%d", TRUE);
         } else {
-            mr_asprintf(&p1, "%d", FALSE);
+            mr_asprintf(p1, "%d", FALSE);
         }
     }
@@ -288 +288 @@
     char *p = NULL;
 
-    mr_asprintf(&p, "%d", FALSE);
+    mr_asprintf(p, "%d", FALSE);
     if (strcmp(str,p) != 0) {
         ret = TRUE;