Changeset 1080 in MondoRescue for branches/stable/mondo/src/common/libmondo-raid.c

Timestamp:

Jan 28, 2007, 7:04:41 PM (17 years ago)

Author:

Bruno Cornec

Message:

• Fix mindi install messages (reported by Andree Leidenfrost)
• remove paranoid_free/free for mr_free
• mr_asprintf used everywhere
• mr_malloc used everywhere

File:

• branches/stable/mondo/src/common/libmondo-raid.c (modified) (24 diffs)

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

@@ -18 +18 @@
 #include "libmondo-raid.h"
 #include "mr_str.h"
+#include "mr_mem.h"
 
 #ifdef __FreeBSD__
@@ -49 +50 @@
     int res;
 
-    command = malloc(MAX_STR_LEN * 2);
+    command = mr_malloc(MAX_STR_LEN * 2);
     strcpy(command, "grep \" /proc/mdstat");
     if (raidno == -1) {
@@ -59 +60 @@
     log_it("Is raid %d registered? Command = '%s'", raidno, command);
     res = system(command);
-    paranoid_free(command);
+    mr_free(command);
     if (res) {
         return (FALSE);
@@ -200 +201 @@
     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
@@ -436 +437 @@
     label[0] = value[0] = '\0';
     if (feof(fin)) {
-        paranoid_free(incoming);
+        mr_free(incoming);
         return (1);
     }
@@ -452 +453 @@
         strcpy(label, incoming);
         strcpy(value, p);
-        paranoid_free(incoming);
+        mr_free(incoming);
         return (0);
     }
@@ -480 +481 @@
         log_it("Raidtab is very small or non-existent. Ignoring it.");
         raidlist->entries = 0;
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (0);
     }
     if (!(fin = fopen(fname, "r"))) {
         log_it("Cannot open raidtab");
-        paranoid_free(tmp);
+        mr_free(tmp);
         return (1);
     }
@@ -590 +591 @@
     sprintf(tmp, "%d RAID devices in raidtab", raidlist->entries);
     log_it(tmp);
-    paranoid_free(tmp);
+    mr_free(tmp);
     return (0);
 }
@@ -616 +617 @@
         log_it("Raidtab is very small or non-existent. Ignoring it.");
         raidlist->entries = 0;
-        paranoid_free(tmp);
-        paranoid_free(label);
-        paranoid_free(value);
+        mr_free(tmp);
+        mr_free(label);
+        mr_free(value);
         return (0);
     }
     if (!(fin = fopen(fname, "r"))) {
         log_it("Cannot open raidtab");
-        paranoid_free(tmp);
-        paranoid_free(label);
-        paranoid_free(value);
+        mr_free(tmp);
+        mr_free(label);
+        mr_free(value);
         return (1);
     }
@@ -661 +662 @@
     log_msg(1, "Raidtab loaded successfully.");
     log_msg(1, "%d RAID devices in raidtab", items);
-    paranoid_free(tmp);
-    paranoid_free(label);
-    paranoid_free(value);
+    mr_free(tmp);
+    mr_free(label);
+    mr_free(value);
     return (0);
 }
@@ -762 +763 @@
         raidrec->additional_vars.entries = ++v;
     }
-    paranoid_free(tmp);
-    paranoid_free(labelB);
-    paranoid_free(valueB);
+    mr_free(tmp);
+    mr_free(labelB);
+    mr_free(valueB);
 }
 #endif
@@ -820 +821 @@
     static char *argv[64];
     char **ap;
-    char *line = (char *) malloc(MAX_STR_LEN);
-    if (!line)
-        errx(1,
-             "unable to allocate %i bytes of memory for `char *line' at %s:%i",
-             MAX_STR_LEN, __FILE__, __LINE__);
+    char *line = (char *) mr_malloc(MAX_STR_LEN);
     (void) fgets(line, MAX_STR_LEN, f);
     if (feof(f)) {
@@ -868 +865 @@
     int i, j;
     static char **ret;
-    ret = (char **) malloc(nval * sizeof(char *));
+    ret = (char **) mr_malloc(nval * sizeof(char *));
     for (i = 0; i < (argc - nval); ++i) {
         if (!strcmp(argv[i], option)) {
             for (j = 0; j < nval; ++j) {
-                ret[j] = (char *) malloc(strlen(argv[i + j + 1]) + 1);
+                ret[j] = (char *) mr_malloc(strlen(argv[i + j + 1]) + 1);
                 strcpy(ret[j], argv[i + j + 1]);
             }
@@ -1014 +1011 @@
     asprintf(&strtmp, pos);
     strcpy(string, strtmp);
-    paranoid_free(strtmp);
+    mr_free(strtmp);
     // if we have newline after only spaces, this is a blank line, update
     // counters, otherwise do normal parsing
@@ -1035 +1032 @@
     asprintf(&strtmp,"%s%s", device_prefix, token);
     strcpy(raidlist->el[raidlist->entries].raid_device, strtmp);
-    paranoid_free(strtmp);
-    paranoid_free(token);
+    mr_free(strtmp);
+    mr_free(token);
     // skip ':' and status
     token = mr_strtok (string, delims, &lastpos);
-    paranoid_free(token);
+    mr_free(token);
     token = mr_strtok (string, delims, &lastpos);
     if (!strcmp(token, "inactive")) {
       log_msg(1, "RAID device '%s' inactive.\n",
          raidlist->el[raidlist->entries].raid_device);
-      paranoid_free(string);
-      paranoid_free(token);
+      mr_free(string);
+      mr_free(token);
       return 1;
     }
-    paranoid_free(token);
+    mr_free(token);
 
     // get RAID level
@@ -1070 +1067 @@
     } else {
       log_msg(1, "Unknown RAID level '%s'.\n", token);
-      paranoid_free(string);
-      paranoid_free(token);
+      mr_free(string);
+      mr_free(token);
       return 1;
     }
-    paranoid_free(token);
+    mr_free(token);
 
     // get RAID devices (type, index, device)
@@ -1094 +1091 @@
         asprintf(&strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].data_disks.el[raidlist->el[raidlist->entries].data_disks.entries].device, strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         raidlist->el[raidlist->entries].data_disks.entries++;
         break;
@@ -1101 +1098 @@
         asprintf(&strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].spare_disks.el[raidlist->el[raidlist->entries].spare_disks.entries].device, strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         raidlist->el[raidlist->entries].spare_disks.entries++;
         break;
@@ -1108 +1105 @@
         asprintf(&strtmp,"%s%s", device_prefix, token);
         strcpy(raidlist->el[raidlist->entries].failed_disks.el[raidlist->el[raidlist->entries].failed_disks.entries].device, strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
         raidlist->el[raidlist->entries].failed_disks.entries++;
         log_it("At least one failed disk found in RAID array.\n");
@@ -1114 +1111 @@
       default: // error
         log_msg(1, "Unknown device type '%c'\n", type);
-        paranoid_free(string);
-        paranoid_free(token);
+        mr_free(string);
+        mr_free(token);
         return 1;
         break;
       }
-      paranoid_free(token);
+      mr_free(token);
     }
 
@@ -1172 +1169 @@
         if (pos < string) {
           log_it("String underflow!\n");
-          paranoid_free(string);
+          mr_free(string);
           return 1;
         }
@@ -1197 +1194 @@
         if (pos < string) {
           printf("ERROR: String underflow!\n");
-          paranoid_free(string);
+          mr_free(string);
           return 1;
         }
@@ -1214 +1211 @@
   fclose(fin);
   // free string
-  paranoid_free(string);
+  mr_free(string);
   // return success
   return 0;
@@ -1228 +1225 @@
     int retval = 0;
 
-    raidlist = malloc(sizeof(struct raidlist_itself));
+    raidlist = mr_malloc(sizeof(struct raidlist_itself));
 
     // FIXME: Prefix '/dev/' should really be dynamic!