Changeset 2211 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-mountlist.c

Timestamp:

Jun 3, 2009, 7:10:19 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3089@localhost: bruno | 2009-05-18 06:41:05 +0200

• move call to asprintf to call to mr_asprintf (suppress a compiler warning)
• remove all the most obvious bad call to strcat and replace by mr_strcat as appropriate

File:

• branches/2.2.9/mondo/src/common/libmondo-mountlist.c (modified) (11 diffs)

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

@@ -74 +74 @@
     prev_part_no = 0;
     tmp[0] = '\0';
-    asprintf(&flaws_str, "%s", "");
+    mr_asprintf(&flaws_str, "%s", "");
 
 
@@ -363 +363 @@
     assert_string_is_neither_NULL_nor_zerolength(drive);
     assert(mountlist != NULL);
-    asprintf(&flaws_str, "%s", "");
+    mr_asprintf(&flaws_str, "%s", "");
 
     malloc_string(tmp);
@@ -522 +522 @@
     assert(flaws_str_C != NULL);
 
-    asprintf(&flaws_str, "%s", "");
+    mr_asprintf(&flaws_str, "%s", "");
 
     make_list_of_drives_in_mountlist(mountlist, drivelist);
@@ -532 +532 @@
             (drivelist->el[i].device,
              DONT_KNOW_HOW_TO_EVALUATE_THIS_DEVICE_TYPE)) {
-            asprintf(&tmp, " Not evaluating %s (I don't know how yet)",
+            mr_asprintf(&tmp, " Not evaluating %s (I don't know how yet)",
                     drivelist->el[i].device);
             log_it(tmp);
@@ -606 +606 @@
 
     for (currline = 0; currline < mountlist->entries; currline++) {
-        asprintf(&curr_mountpoint, "%s", mountlist->el[currline].mountpoint);
+        mr_asprintf(&curr_mountpoint, "%s", mountlist->el[currline].mountpoint);
         for (i = 0, copies = 0, last_copy = -1; i < mountlist->entries;
              i++) {
@@ -618 +618 @@
         if (copies > 1 && last_copy == currline
             && strcmp(curr_mountpoint, "raid")) {
-            asprintf(&tmp, " %s %s's.", number_to_text(copies),
+            mr_asprintf(&tmp, " %s %s's.", number_to_text(copies),
                     curr_mountpoint);
             mr_strcat(flaws_str, "%s", tmp);
@@ -657 +657 @@
     for (lino = 0, noof_drives = 0; lino < mountlist->entries; lino++) {
 
-        asprintf(&drive, "%s", mountlist->el[lino].device);
+        mr_asprintf(&drive, "%s", mountlist->el[lino].device);
         if (!strncmp(drive, RAID_DEVICE_STUB, strlen(RAID_DEVICE_STUB))) {
             log_msg(8, "Not putting %s in list of drives: it's a virtual drive", drive);
@@ -733 +733 @@
                        (void *) &mountlist->el[i],
                        sizeof(struct mountlist_line));
-                asprintf(&tmp,
+                mr_asprintf(&tmp,
                          "%s is available; user may choose to add it to raid device",
                          output_list->el[items - 1].device);
@@ -853 +853 @@
             if (j < items) {
                 strcat(mountlist->el[items].device, "_dup");
-                asprintf(&tmp,
+                mr_asprintf(&tmp,
                          "Duplicate entry in mountlist - renaming to %s",
                          mountlist->el[items].device);
@@ -859 +859 @@
                 paranoid_free(tmp);
             }
-            asprintf(&tmp, "%s", mountlist->el[items].device);
+            mr_asprintf(&tmp, "%s", mountlist->el[items].device);
             if (strstr(tmp, "/dev/md/")) {
                 log_it("format_device() --- Contracting %s", tmp);
@@ -1008 +1008 @@
     assert(b >= 0);
 
-    asprintf(&device, "%s", mountlist->el[a].device);
-    asprintf(&mountpoint, "%s", mountlist->el[a].mountpoint);
-    asprintf(&format, "%s", mountlist->el[a].format);
+    mr_asprintf(&device, "%s", mountlist->el[a].device);
+    mr_asprintf(&mountpoint, "%s", mountlist->el[a].mountpoint);
+    mr_asprintf(&format, "%s", mountlist->el[a].format);
 
     size = mountlist->el[a].size;