suckless
/
svkbd
mirror of git://git.suckless.org/svkbd
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

put estrdup in util and use die() instead of BSD err()

This commit is contained in:
Hiltjo Posthuma 2021-03-28 14:41:32 +02:00
parent b80819aa3f
commit d19a80dfe5
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
svkbd.c
View File

@ -11,7 +11,6 @@
#include <time.h> #include <time.h>
#include <unistd.h> #include <unistd.h>
#include <ctype.h> #include <ctype.h>
#include <err.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/keysymdef.h> #include <X11/keysymdef.h>
@ -85,8 +84,6 @@ static void togglelayer();
static void unpress(Key *k, KeySym mod); static void unpress(Key *k, KeySym mod);
static void updatekeys(); static void updatekeys();
static void printkey(Key *k, KeySym mod); static void printkey(Key *k, KeySym mod);
static char *estrdup(const char *str);
/* variables */ /* variables */
static int screen; static int screen;
@ -138,12 +135,6 @@ Bool sigtermd = False;
static Key keys[KEYS] = { NULL }; static Key keys[KEYS] = { NULL };
static Key* layers[LAYERS]; static Key* layers[LAYERS];
char * estrdup(const char *str) {
char * tmp = strdup(str);
if (tmp == NULL) errx(1, "strdup failed");
return tmp;
}
void void
motionnotify(XEvent *e) motionnotify(XEvent *e)
{ {

10
util.c
View File

@ -16,6 +16,16 @@ ecalloc(size_t nmemb, size_t size)
return p; return p;
} }
char *
estrdup(const char *s)
{
char *p;
if (!(p = strdup(s)))
die("strdup:");
return p;
}
void void
die(const char *fmt, ...) die(const char *fmt, ...)
{ {

1
util.h
View File

@ -6,3 +6,4 @@
void die(const char *fmt, ...); void die(const char *fmt, ...);
void *ecalloc(size_t nmemb, size_t size); void *ecalloc(size_t nmemb, size_t size);
char *estrdup(const char *s);