Changeset 1081 in MondoRescue for trunk/mondo/src/include/my-stuff.h

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/include/my-stuff.h (modified) (3 diffs)

trunk/mondo/src/include/my-stuff.h

@@ -14 +14 @@
 #define NOOF_ERR_LINES  6   
 
-#define paranoid_free(exp) mr_free(exp)
-
 /**
  * @file
@@ -22 +20 @@
 
 #include <stdio.h>
+#include "mr_mem.h"
 
 #if !defined(bool) && !defined(__cplusplus)
@@ -286 +285 @@
  * Malloc @p x to be MAX_STR_LEN bytes and call fatal_error() if we're out of memory.
  */
-#define malloc_string(x) { x = (char *)malloc(MAX_STR_LEN); if (!x) { fatal_error("Unable to malloc"); } x[0] = x[1] = '\0'; }
+#define malloc_string(x) { x = (char *)mr_malloc(MAX_STR_LEN); x[0] = x[1] = '\0'; }
 
 /**