X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=slock.c;h=d2f08862453615c3131332273fbd1d0187f4195c;hb=7d31ff65a0b0388f788ca6932c815ab29e5fb10f;hp=6dbf966f69b0ec45aad6d0e4b930ac82de255b3c;hpb=6a1bd896356ae3b59053b5e458fdff62d076114b;p=slock.git

diff --git a/slock.c b/slock.c
index 6dbf966..d2f0886 100644
--- a/slock.c
+++ b/slock.c
@@ -31,8 +31,6 @@ enum {
 	NUMCOLS
 };
 
-#include "config.h"
-
 struct lock {
 	int screen;
 	Window root, win;
@@ -46,6 +44,8 @@ struct xrandr {
 	int errbase;
 };
 
+#include "config.h"
+
 static void
 die(const char *errstr, ...)
 {
@@ -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. "
@@ -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;