Use explicit strcmp() instead of inlining it
authorFRIGN <dev@frign.de>
Sat, 1 Oct 2016 22:10:45 +0000 (00:10 +0200)
committerMarkus Teich <markus.teich@stusta.mhn.de>
Mon, 10 Oct 2016 18:40:13 +0000 (20:40 +0200)
Makes it a tad more readable; the previous "optimization" will be done
by the compiler anyway.

slock.c

diff --git a/slock.c b/slock.c
index 6dbf966..4d7f06f 100644 (file)
--- 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. "