X-Git-Url: https://git.danieliu.xyz/?p=dwm.git;a=blobdiff_plain;f=util.c;h=fe044fc7b7978d1f3c23768e315aae415d90b11a;hp=3553f5d3f01ab8ad5cb3d5861a1d6811238c834f;hb=HEAD;hpb=8a34fa50f75f4d6d8af234ac0c4f6d40b988d700 diff --git a/util.c b/util.c index 3553f5d..fe044fc 100644 --- a/util.c +++ b/util.c @@ -1,18 +1,35 @@ -/* - * (C)opyright MMVI Anselm R. Garbe - * See LICENSE file for license details. - */ - +/* See LICENSE file for copyright and license details. */ #include #include #include +#include + +#include "util.h" + +void * +ecalloc(size_t nmemb, size_t size) +{ + void *p; + + if (!(p = calloc(nmemb, size))) + die("calloc:"); + return p; +} void -error(char *errstr, ...) { +die(const char *fmt, ...) { va_list ap; - va_start(ap, errstr); - vfprintf(stderr, errstr, ap); + + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); va_end(ap); + + if (fmt[0] && fmt[strlen(fmt)-1] == ':') { + fputc(' ', stderr); + perror(NULL); + } else { + fputc('\n', stderr); + } + exit(1); } -