Changeset 3185 in MondoRescue for branches/3.0/mondo/src/lib

Timestamp:

Sep 20, 2013, 2:29:57 PM (12 years ago)

Author:

Bruno Cornec

Message:

Simplify the interface of mr_getline and mr_asprintf. With 3.1 compatibility now will allow backports from this branch into 3.0

Location:

branches/3.0/mondo/src/lib

Files:

• mr_conf.c (modified) (6 diffs)
• mr_mem.c (modified) (1 diff)

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

@@ -107 +107 @@
     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 */
@@ -199 +199 @@
     p = mr_conf_read(field_name);
     if (p != NULL) {
-        mr_asprintf(&p1, "%d", p);
+        mr_asprintf(p1, "%d", p);
         }
     return p1;
@@ -211 +211 @@
     p = mr_conf_read(field_name);
     if (p != NULL) {
-        mr_asprintf(&p1, "%f", p);
+        mr_asprintf(p1, "%f", p);
     }
     return p1;
@@ -233 +233 @@
         return(p);
     }
-    mr_asprintf(&q, "%s", p);
+    mr_asprintf(q, "%s", p);
 
     if (*p != '"') {
@@ -276 +276 @@
             (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);
         }
     }
@@ -289 +289 @@
     char *p = NULL;
 
-    mr_asprintf(&p, "%d", FALSE);
+    mr_asprintf(p, "%d", FALSE);
     if (strcmp(str,p) != 0) {
         ret = TRUE;

branches/3.0/mondo/src/lib/mr_mem.c

@@ -122 +122 @@
  */
 void mr_strcat_int(char **in, int line, const char *file, const char *fmt, ...) {
-
     char *fmt2 = NULL;
     va_list args;