Changeset 1081 in MondoRescue for trunk/mondo/src/common/libmondo-raid.c

Timestamp:

Jan 28, 2007, 11:20:07 PM (17 years ago)

Author:

Bruno Cornec

Message:

merge -r1078:1080 $SVN_M/branches/stable

File:

• trunk/mondo/src/common/libmondo-raid.c (modified) (3 diffs)

trunk/mondo/src/common/libmondo-raid.c

@@ -18 +18 @@
 #include "mr_mem.h"
 #include "mr_str.h"
+#include "mr_mem.h"
 
 #ifdef __FreeBSD__
@@ -817 +818 @@
     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]);
             }
@@ -1175 +1176 @@
     int retval = 0;
 
-    raidlist = malloc(sizeof(struct raidlist_itself));
+    raidlist = mr_malloc(sizeof(struct raidlist_itself));
 
     // FIXME: Prefix '/dev/' should really be dynamic!