diff --git a/svkbd.c b/svkbd.c index 661470a..855f0bd 100644 --- a/svkbd.c +++ b/svkbd.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include @@ -85,8 +84,6 @@ static void togglelayer(); static void unpress(Key *k, KeySym mod); static void updatekeys(); static void printkey(Key *k, KeySym mod); -static char *estrdup(const char *str); - /* variables */ static int screen; @@ -138,12 +135,6 @@ Bool sigtermd = False; static Key keys[KEYS] = { NULL }; static Key* layers[LAYERS]; -char * estrdup(const char *str) { - char * tmp = strdup(str); - if (tmp == NULL) errx(1, "strdup failed"); - return tmp; -} - void motionnotify(XEvent *e) { diff --git a/util.c b/util.c index 176f807..3f3b6f0 100644 --- a/util.c +++ b/util.c @@ -16,6 +16,16 @@ ecalloc(size_t nmemb, size_t size) return p; } +char * +estrdup(const char *s) +{ + char *p; + + if (!(p = strdup(s))) + die("strdup:"); + return p; +} + void die(const char *fmt, ...) { diff --git a/util.h b/util.h index f633b51..44a5d83 100644 --- a/util.h +++ b/util.h @@ -6,3 +6,4 @@ void die(const char *fmt, ...); void *ecalloc(size_t nmemb, size_t size); +char *estrdup(const char *s);