X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=util.c;h=62b816b964bbf01c8861c1b255fd909b27baf38f;hb=771c0cb6072b3e90d4ed7007073552736c49e655;hp=1b9bc57b79efdc0e3b2db8a7c5c4bb41e563fed8;hpb=5077207088b08e6b21601cb19925d20e9d5af573;p=dmenu.git diff --git a/util.c b/util.c index 1b9bc57..62b816b 100644 --- a/util.c +++ b/util.c @@ -1,5 +1,4 @@ -/* - * (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVII Anselm R. Garbe * See LICENSE file for license details. */ #include "dmenu.h" @@ -10,28 +9,17 @@ #include #include -/* static */ - -static void -bad_malloc(unsigned int size) -{ - eprint("fatal: could not malloc() %u bytes\n", size); -} - -/* extern */ - void * -emalloc(unsigned int size) -{ +emalloc(unsigned int size) { void *res = malloc(size); + if(!res) - bad_malloc(size); + eprint("fatal: could not malloc() %u bytes\n", size); return res; } void -eprint(const char *errstr, ...) -{ +eprint(const char *errstr, ...) { va_list ap; va_start(ap, errstr); @@ -41,10 +29,10 @@ eprint(const char *errstr, ...) } char * -estrdup(const char *str) -{ +estrdup(const char *str) { void *res = strdup(str); + if(!res) - bad_malloc(strlen(str)); + eprint("fatal: could not malloc() %u bytes\n", strlen(str)); return res; }