fix regressions

[apps/madmutt.git] / lib / mem.c

diff --git a/lib/mem.c b/lib/mem.c
index 344b7cf..df2e2ed 100644 (file)
--- a/lib/mem.c
+++ b/lib/mem.c
@@ -10,37 +10,6 @@
 #include "exit.h"
 #include "intl.h"
 
-void *_mem_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 ("mem_calloc", _("Integer overflow -- can't allocate memory!"),
-                line, fname, 1);
-    return (NULL);
-  }
-
-  if (!(p = calloc (nmemb, size))) {
-    exit_fatal ("mem_calloc", _("Out of memory!"), line, fname, 1);
-    return (NULL);
-  }
-  return p;
-}
-
-void *_mem_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 ("mem_malloc", _("Out of memory!"), line, fname, 1);
-    return (NULL);
-  }
-  return (p);
-}
-
 void _mem_realloc (void *ptr, size_t siz, int line, const char* fname) {
   void *r;
   void **p = (void **) ptr;
@@ -65,12 +34,3 @@ void _mem_realloc (void *ptr, size_t siz, int line, const char* fname) {
 
   *p = r;
 }
-
-void _mem_free (void *ptr) {
-  void **p = (void **) ptr;
-
-  if (*p) {
-    free (*p);                  /* __MEM_CHECKED__ */
-    *p = 0;
-  }
-}