X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib%2Fmem.c;h=df2e2edb18a662ea41bce64a49349dbc838828ea;hb=49f1156410e9a037404101696d37b2c0d5c67564;hp=f978090b63b2e60d75e89046964c2c63323f3319;hpb=74a2265af51ce89bca845adc1d68f273c9933c13;p=apps%2Fmadmutt.git

diff --git a/lib/mem.c b/lib/mem.c
index f978090..df2e2ed 100644
--- a/lib/mem.c
+++ b/lib/mem.c
@@ -10,38 +10,7 @@
 #include "exit.h"
 #include "intl.h"
 
-void *_safe_calloc (size_t nmemb, size_t size, int line, const char* fname) {
-  void *p;
-
-  if (!nmemb || !size)
-    return NULL;
-
-  if (((size_t) - 1) / nmemb <= size) {
-    exit_fatal ("safe_calloc", _("Integer overflow -- can't allocate memory!"),
-                line, fname, 1);
-    return (NULL);
-  }
-
-  if (!(p = calloc (nmemb, size))) {
-    exit_fatal ("safe_calloc", _("Out of memory!"), line, fname, 1);
-    return (NULL);
-  }
-  return p;
-}
-
-void *_safe_malloc (size_t siz, int line, const char* fname) {
-  void *p;
-
-  if (siz == 0)
-    return 0;
-  if ((p = (void *) malloc (siz)) == 0) {       /* __MEM_CHECKED__ */
-    exit_fatal ("safe_malloc", _("Out of memory!"), line, fname, 1);
-    return (NULL);
-  }
-  return (p);
-}
-
-void _safe_realloc (void *ptr, size_t siz, int line, const char* fname) {
+void _mem_realloc (void *ptr, size_t siz, int line, const char* fname) {
   void *r;
   void **p = (void **) ptr;
 
@@ -61,16 +30,7 @@ void _safe_realloc (void *ptr, size_t siz, int line, const char* fname) {
   }
 
   if (!r)
-    exit_fatal ("safe_realloc", _("Out of memory!"), line, fname, 1);
+    exit_fatal ("mem_realloc", _("Out of memory!"), line, fname, 1);
 
   *p = r;
 }
-
-void _safe_free (void *ptr) {
-  void **p = (void **) ptr;
-
-  if (*p) {
-    free (*p);                  /* __MEM_CHECKED__ */
-    *p = 0;
-  }
-}