Changeset 3185 in MondoRescue for branches/3.0/mondo/src/common/libmondo-string.c

Timestamp:

Sep 20, 2013, 2:29:57 PM (11 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

File:

• branches/3.0/mondo/src/common/libmondo-string.c (modified) (2 diffs)

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

@@ -817 +817 @@
 
     assert_string_is_neither_NULL_nor_zerolength(partition);
-    mr_asprintf(&trunc, "%s", partition);
+    mr_asprintf(trunc, "%s", partition);
 
 #ifdef __FreeBSD__
@@ -1122 +1122 @@
     switch (type_of_bkp) {
     case dvd:
-        mr_asprintf(&type_of_backup, "DVD");
+        mr_asprintf(type_of_backup, "DVD");
         break;
     case cdr:
-        mr_asprintf(&type_of_backup, "CDR");
+        mr_asprintf(type_of_backup, "CDR");
         break;
     case cdrw:
-        mr_asprintf(&type_of_backup, "CDRW");
+        mr_asprintf(type_of_backup, "CDRW");
         break;
     case tape:
-        mr_asprintf(&type_of_backup, "tape");
+        mr_asprintf(type_of_backup, "tape");
         break;
     case cdstream:
-        mr_asprintf(&type_of_backup, "CDR");
+        mr_asprintf(type_of_backup, "CDR");
         break;
     case udev:
-        mr_asprintf(&type_of_backup, "udev");
+        mr_asprintf(type_of_backup, "udev");
         break;
     case iso:
-        mr_asprintf(&type_of_backup, "ISO");
+        mr_asprintf(type_of_backup, "ISO");
         break;
     case netfs:
-        mr_asprintf(&type_of_backup, "%s", bkpinfo->netfs_proto);
+        mr_asprintf(type_of_backup, "%s", bkpinfo->netfs_proto);
         break;
     case usb:
-        mr_asprintf(&type_of_backup, "USB");
+        mr_asprintf(type_of_backup, "USB");
         break;
     default:
-        mr_asprintf(&type_of_backup, "ISO");
+        mr_asprintf(type_of_backup, "ISO");
     }
     return (type_of_backup);