X-Git-Url: https://git.xinqibao.xyz/dmenu.git/blobdiff_plain/df85dd743c9924bb2925943dbaf57acf0d0fc31f..3bc1f99e3cc645b0160cba51805afb3f9f711fa0:/util.c?ds=sidebyside diff --git a/util.c b/util.c index 0e8828c..124bcd5 100644 --- a/util.c +++ b/util.c @@ -1,5 +1,4 @@ -/* - * (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI-MMVII Anselm R. Garbe * See LICENSE file for license details. */ #include "dmenu.h" @@ -7,31 +6,18 @@ #include #include #include -#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 +27,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; }