X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=slock.c;h=ad539dc123c169e46a43322104fd38cee0d14b48;hb=597469541c10fdb8920ed190b72763b0719e5cb5;hp=47d2e2134bedea54f8ae8831ef03eb4dddef5260;hpb=b099d2fd1868a5497069b85e5af0e6148077a6ba;p=slock.git

diff --git a/slock.c b/slock.c
index 47d2e21..ad539dc 100644
--- a/slock.c
+++ b/slock.c
@@ -100,7 +100,7 @@ gethash(void)
 	hash = pw->pw_passwd;
 
 #if HAVE_SHADOW_H
-	if (hash[0] == 'x' && hash[1] == '\0') {
+	if (!strcmp(hash, "x")) {
 		struct spwd *sp;
 		if (!(sp = getspnam(pw->pw_name)))
 			die("slock: getspnam: cannot retrieve shadow entry. "
@@ -108,7 +108,7 @@ gethash(void)
 		hash = sp->sp_pwdp;
 	}
 #else
-	if (hash[0] == '*' && hash[1] == '\0') {
+	if (!strcmp(hash, "*")) {
 #ifdef __OpenBSD__
 		if (!(pw = getpwuid_shadow(getuid())))
 			die("slock: getpwnam_shadow: cannot retrieve shadow entry. "
@@ -130,15 +130,15 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
 {
 	XRRScreenChangeNotifyEvent *rre;
 	char buf[32], passwd[256], *inputhash;
-	int num, screen, running, failure;
+	int num, screen, running, failure, oldc;
 	unsigned int len, color;
 	KeySym ksym;
 	XEvent ev;
-	static int oldc = INIT;
 
 	len = 0;
 	running = 1;
 	failure = 0;
+	oldc = INIT;
 
 	while (running && !XNextEvent(dpy, &ev)) {
 		if (ev.type == KeyPress) {
@@ -166,7 +166,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
 					running = !!strcmp(inputhash, hash);
 				if (running) {
 					XBell(dpy, 100);
-					failure = True;
+					failure = 1;
 				}
 				explicit_bzero(&passwd, sizeof(passwd));
 				len = 0;