aboutsummaryrefslogtreecommitdiffstats
path: root/src/mem.c
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2011-11-02 18:59:40 +0100
committerLukas Fleischer <calcurse@cryptocrack.de>2011-11-02 19:33:23 +0100
commitce3f0ce76f59216ff82ecd79e180a5c59d3d60d0 (patch)
treea0d7618a75c1f9aae4efe2059efb90f8a066b546 /src/mem.c
parent7cc6305588acea9c7960abaacf823d62f798f5ba (diff)
downloadcalcurse-ce3f0ce76f59216ff82ecd79e180a5c59d3d60d0.tar.gz
calcurse-ce3f0ce76f59216ff82ecd79e180a5c59d3d60d0.zip
Make use of the NULL macro
Use this constant everywhere when referring to a null pointer instead of casting 0 to various types of pointers. Created using following semantic patch: @@ type type; @@ - (type *)0 + NULL Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
Diffstat (limited to 'src/mem.c')
-rw-r--r--src/mem.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mem.c b/src/mem.c
index 63aea73..01fb010 100644
--- a/src/mem.c
+++ b/src/mem.c
@@ -176,7 +176,7 @@ dbg_malloc (size_t size, const char *pos)
unsigned *buf;
if (size == 0)
- return (void *)0;
+ return NULL;
size = EXTRA_SPACE + (size + sizeof (unsigned) - 1) / sizeof (unsigned);
buf = xmalloc (size * sizeof (unsigned));
@@ -197,13 +197,13 @@ dbg_calloc (size_t nmemb, size_t size, const char *pos)
void *buf;
if (!nmemb || !size)
- return (void *)0;
+ return NULL;
EXIT_IF (nmemb > SIZE_MAX / size, _("overflow at %s"), pos);
size *= nmemb;
if ((buf = dbg_malloc (size, pos)) == NULL)
- return (void *)0;
+ return NULL;
bzero (buf, size);
@@ -216,16 +216,16 @@ dbg_realloc (void *ptr, size_t nmemb, size_t size, const char *pos)
unsigned *buf, old_size, new_size, cpy_size;
if (ptr == NULL)
- return (void *)0;
+ return NULL;
new_size = nmemb *size;
if (new_size == 0)
- return (void *)0;
+ return NULL;
EXIT_IF (nmemb > SIZE_MAX / size, _("overflow at %s"), pos);
if ((buf = dbg_malloc (new_size, pos)) == NULL)
- return (void *)0;
+ return NULL;
old_size = *((unsigned *)ptr - EXTRA_SPACE_START + BLK_SIZE);
cpy_size = (old_size > new_size) ? new_size : old_size;
@@ -243,11 +243,11 @@ dbg_strdup (const char *s, const char *pos)
char *buf;
if (s == NULL)
- return (char *)0;
+ return NULL;
size = strlen (s);
if ((buf = dbg_malloc (size + 1, pos)) == NULL)
- return (char *)0;
+ return NULL;
return strncpy (buf, s, size + 1);
}