X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=util.c;h=62b816b964bbf01c8861c1b255fd909b27baf38f;hb=771c0cb6072b3e90d4ed7007073552736c49e655;hp=0e8828cf238072e9bc4cd8641c626c7e1e86074e;hpb=df85dd743c9924bb2925943dbaf57acf0d0fc31f;p=dmenu.git diff --git a/util.c b/util.c index 0e8828c..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 -badmalloc(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) - badmalloc(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) - badmalloc(strlen(str)); + eprint("fatal: could not malloc() %u bytes\n", strlen(str)); return res; }