X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=util.c;h=b7798d29f040fa57b4e91a4e86e7d0a85d96a4cf;hb=3d25a327aad95e38ecd1642af58a49fc555a9d01;hp=0e8828cf238072e9bc4cd8641c626c7e1e86074e;hpb=df85dd743c9924bb2925943dbaf57acf0d0fc31f;p=dmenu.git diff --git a/util.c b/util.c index 0e8828c..b7798d2 100644 --- a/util.c +++ b/util.c @@ -1,5 +1,4 @@ -/* - * (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI Anselm R. Garbe * See LICENSE file for license details. */ #include "dmenu.h" @@ -10,28 +9,26 @@ #include #include -/* static */ +void * +emalloc(unsigned int size) { + void *res = malloc(size); -static void -badmalloc(unsigned int size) -{ - eprint("fatal: could not malloc() %u bytes\n", size); + if(!res) + eprint("fatal: could not malloc() %u bytes\n", size); + return res; } -/* extern */ +char * +estrdup(const char *str) { + void *res = strdup(str); -void * -emalloc(unsigned int size) -{ - void *res = malloc(size); if(!res) - badmalloc(size); + eprint("fatal: could not malloc() %u bytes\n", strlen(str)); return res; } void -eprint(const char *errstr, ...) -{ +eprint(const char *errstr, ...) { va_list ap; va_start(ap, errstr); @@ -39,12 +36,3 @@ eprint(const char *errstr, ...) va_end(ap); exit(EXIT_FAILURE); } - -char * -estrdup(const char *str) -{ - void *res = strdup(str); - if(!res) - badmalloc(strlen(str)); - return res; -}