Changeset 1227 in MondoRescue

Timestamp:

Mar 6, 2007, 1:13:38 PM (18 years ago)

Author:

Bruno Cornec

Message:

Removal of MRCONF_ALLOC_FAILED as mr_malloc is always returning a pointer or exiting in case of pb.

File:

• branches/stable/mondo/src/lib/mr_conf.c (modified) (5 diffs)

branches/stable/mondo/src/lib/mr_conf.c

@@ -24 +24 @@
 #define MRCONF_NO_ERROR             0x0
 #define MRCONF_BAD_FILE             0x1
-#define MRCONF_ALLOC_FAILED         0x2
 #define MRCONF_READING_FAILED       0x3
 #define MRCONF_NO_GROUP_START       0x4
@@ -115 +114 @@
     /*allocate memory for the buffers */
     buffer = (char *) mr_malloc(sizeof(char) * (length + 1));
-
-    if (buffer == NULL) {
-        mr_conf_error_msg(MRCONF_ALLOC_FAILED, "");
-        return (MRCONF_ALLOC_FAILED);
-    }
 
     /*set flag that module is in "open" state */
@@ -253 +247 @@
     /*copy filtered data to the buffer */
     ret = (char *) mr_malloc(sizeof(char) * (size));
-    if (ret == NULL) {
-        mr_conf_error_msg(MRCONF_ALLOC_FAILED, "");
-        return (NULL);
-    }
     while (i < size - 1) {
         ret[i] = *p;
@@ -293 +283 @@
     /* k is new buffer length now */
     tmp_buf = (char *) mr_malloc(sizeof(char) * (k + 1));
-    if (tmp_buf == NULL) {
-        mr_conf_error_msg(MRCONF_ALLOC_FAILED, "");
-        return;
-    }
 
     k = 0;
@@ -355 +341 @@
             break;
 
-        case MRCONF_ALLOC_FAILED:
-            mr_msg(0,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_ALLOC_FAILED);
-            break;
-
         case MRCONF_READING_FAILED:
             mr_msg(0,"%s %s\n", MRCONF_STR_ERROR, MRCONF_STR_READING_FAILED);