X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib%2Fmem.c;h=df2e2edb18a662ea41bce64a49349dbc838828ea;hp=344b7cf5905903db3759ae68fb8a74f1cca1edb9;hb=49f1156410e9a037404101696d37b2c0d5c67564;hpb=ba5e3af4ea19e1d20c80941c077039871ec84258 diff --git a/lib/mem.c b/lib/mem.c index 344b7cf..df2e2ed 100644 --- 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; - } -}