X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=util.c;h=0a8aada749e29bb127c8cf8b1c1da4c073cc789a;hb=d50ff5ca11564237f4f3f4a3b2d28f282c787acf;hp=0e8828cf238072e9bc4cd8641c626c7e1e86074e;hpb=df85dd743c9924bb2925943dbaf57acf0d0fc31f;p=dmenu.git diff --git a/util.c b/util.c index 0e8828c..0a8aada 100644 --- a/util.c +++ b/util.c @@ -1,37 +1,23 @@ -/* - * (C)opyright MMVI Anselm R. Garbe - * See LICENSE file for license details. - */ +/* © 2006-2007 Anselm R. Garbe + * © 2006-2007 Sander van Dijk + * See LICENSE file for license details. */ #include "dmenu.h" #include #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; }