X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=util.c;h=0e8828cf238072e9bc4cd8641c626c7e1e86074e;hb=bd1172e6892f3fcb353905ec5c17c8059e3002af;hp=dff7af72ad89391e93ef3889a5825e8a4ba844de;hpb=7817523a685f0dbba2e074a448099558a54b1b9c;p=dmenu.git diff --git a/util.c b/util.c index dff7af7..0e8828c 100644 --- a/util.c +++ b/util.c @@ -13,7 +13,7 @@ /* static */ static void -bad_malloc(unsigned int size) +badmalloc(unsigned int size) { eprint("fatal: could not malloc() %u bytes\n", size); } @@ -25,17 +25,7 @@ emalloc(unsigned int size) { void *res = malloc(size); if(!res) - bad_malloc(size); - return res; -} - -void * -emallocz(unsigned int size) -{ - void *res = calloc(1, size); - - if(!res) - bad_malloc(size); + badmalloc(size); return res; } @@ -55,14 +45,6 @@ estrdup(const char *str) { void *res = strdup(str); if(!res) - bad_malloc(strlen(str)); + badmalloc(strlen(str)); return res; } - -void -swap(void **p1, void **p2) -{ - void *tmp = *p1; - *p1 = *p2; - *p2 = tmp; -}