projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rocco Rutte:
[apps/madmutt.git]
/
lib
/
mem.c
diff --git
a/lib/mem.c
b/lib/mem.c
index
f978090
..
344b7cf
100644
(file)
--- a/
lib/mem.c
+++ b/
lib/mem.c
@@
-10,38
+10,38
@@
#include "exit.h"
#include "intl.h"
#include "exit.h"
#include "intl.h"
-void *_
safe
_calloc (size_t nmemb, size_t size, int line, const char* fname) {
+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) {
void *p;
if (!nmemb || !size)
return NULL;
if (((size_t) - 1) / nmemb <= size) {
- exit_fatal ("
safe
_calloc", _("Integer overflow -- can't allocate memory!"),
+ exit_fatal ("
mem
_calloc", _("Integer overflow -- can't allocate memory!"),
line, fname, 1);
return (NULL);
}
if (!(p = calloc (nmemb, size))) {
line, fname, 1);
return (NULL);
}
if (!(p = calloc (nmemb, size))) {
- exit_fatal ("
safe
_calloc", _("Out of memory!"), line, fname, 1);
+ exit_fatal ("
mem
_calloc", _("Out of memory!"), line, fname, 1);
return (NULL);
}
return p;
}
return (NULL);
}
return p;
}
-void *_
safe
_malloc (size_t siz, int line, const char* fname) {
+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__ */
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);
+ exit_fatal ("
mem
_malloc", _("Out of memory!"), line, fname, 1);
return (NULL);
}
return (p);
}
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;
void *r;
void **p = (void **) ptr;
@@
-61,12
+61,12
@@
void _safe_realloc (void *ptr, size_t siz, int line, const char* fname) {
}
if (!r)
}
if (!r)
- exit_fatal ("
safe
_realloc", _("Out of memory!"), line, fname, 1);
+ exit_fatal ("
mem
_realloc", _("Out of memory!"), line, fname, 1);
*p = r;
}
*p = r;
}
-void _
safe
_free (void *ptr) {
+void _
mem
_free (void *ptr) {
void **p = (void **) ptr;
if (*p) {
void **p = (void **) ptr;
if (*p) {