Changeset 2515 in MondoRescue for branches/2.2.9/mondo/src

Timestamp:

Jan 4, 2010, 7:36:09 PM (14 years ago)

Author:

Bruno Cornec

Message:

r3226@localhost (orig r2260): bruno | 2009-07-12 02:04:21 +0200

r3201@localhost: bruno | 2009-07-06 18:36:11 +0200

• Replace sprintf by mr_asprintf in libmondo-raid.c

File:

• branches/2.2.9/mondo/src/common/libmondo-raid.c (modified) (8 diffs)

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

@@ -192 +192 @@
 {
     /*@ buffers ***************************************************** */
-    char *sz_value;
-
-    malloc_string(sz_value);
+    char *sz_value = NULL;
+
     assert(raidrec != NULL);
     assert(label != NULL);
 
-    sprintf(sz_value, "%d", value);
+    mr_asprintf(&sz_value, "%d", value);
     strcpy(raidrec->additional_vars.el[lino].label, label);
     strcpy(raidrec->additional_vars.el[lino].value, sz_value);
-    paranoid_free(sz_value);
+    mr_free(sz_value);
 }
 #endif
@@ -472 +471 @@
 {
     FILE *fin;
-    char *tmp;
+    char *tmp1 = NULL;
     int items;
 
-    malloc_string(tmp);
     raidlist->spares.entries = 0;
     raidlist->disks.entries = 0;
@@ -481 +479 @@
         log_it("Raidtab is very small or non-existent. Ignoring it.");
         raidlist->entries = 0;
-        paranoid_free(tmp);
         return (0);
     }
     if (!(fin = fopen(fname, "r"))) {
         log_it("Cannot open raidtab");
-        paranoid_free(tmp);
         return (1);
     }
@@ -589 +585 @@
     fclose(fin);
     log_it("Raidtab loaded successfully.");
-    sprintf(tmp, "%d RAID devices in raidtab", raidlist->entries);
-    log_it(tmp);
-    paranoid_free(tmp);
+    mr_asprintf(&tmp1, "%d RAID devices in raidtab", raidlist->entries);
+    log_it(tmp1);
+    mr_free(tmp1);
     return (0);
 }
@@ -691 +687 @@
 
     /*@ add mallocs * */
-    char *tmp;
+    char *tmp = NULL;
     char *labelB;
     char *valueB;
@@ -699 +695 @@
     int v;
 
-    malloc_string(tmp);
     malloc_string(labelB);
     malloc_string(valueB);
@@ -749 +744 @@
         }
         if (!disklist) {
-            sprintf(tmp,
-                    "Ignoring '%s %s' pair of disk %s", labelB, valueB,
-                    label);
+            mr_asprintf(&tmp, "Ignoring '%s %s' pair of disk %s", labelB, valueB, label);
             log_it(tmp);
+            mr_free(tmp);
         } else {
             index = atoi(valueB);
@@ -763 +757 @@
         raidrec->additional_vars.entries = ++v;
     }
-    paranoid_free(tmp);
     paranoid_free(labelB);
     paranoid_free(valueB);