Use explicit strcmp() instead of inlining it
Makes it a tad more readable; the previous "optimization" will be done by the compiler anyway.
This commit is contained in:
		
							parent
							
								
									6a1bd89635
								
							
						
					
					
						commit
						c96e725df0
					
				
							
								
								
									
										4
									
								
								slock.c
								
								
								
								
							
							
						
						
									
										4
									
								
								slock.c
								
								
								
								
							| 
						 | 
					@ -100,7 +100,7 @@ gethash(void)
 | 
				
			||||||
	hash = pw->pw_passwd;
 | 
						hash = pw->pw_passwd;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if HAVE_SHADOW_H
 | 
					#if HAVE_SHADOW_H
 | 
				
			||||||
	if (hash[0] == 'x' && hash[1] == '\0') {
 | 
						if (!strcmp(hash, "x")) {
 | 
				
			||||||
		struct spwd *sp;
 | 
							struct spwd *sp;
 | 
				
			||||||
		if (!(sp = getspnam(pw->pw_name)))
 | 
							if (!(sp = getspnam(pw->pw_name)))
 | 
				
			||||||
			die("slock: getspnam: cannot retrieve shadow entry. "
 | 
								die("slock: getspnam: cannot retrieve shadow entry. "
 | 
				
			||||||
| 
						 | 
					@ -108,7 +108,7 @@ gethash(void)
 | 
				
			||||||
		hash = sp->sp_pwdp;
 | 
							hash = sp->sp_pwdp;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
#else
 | 
					#else
 | 
				
			||||||
	if (hash[0] == '*' && hash[1] == '\0') {
 | 
						if (!strcmp(hash, "*")) {
 | 
				
			||||||
#ifdef __OpenBSD__
 | 
					#ifdef __OpenBSD__
 | 
				
			||||||
		if (!(pw = getpwuid_shadow(getuid())))
 | 
							if (!(pw = getpwuid_shadow(getuid())))
 | 
				
			||||||
			die("slock: getpwnam_shadow: cannot retrieve shadow entry. "
 | 
								die("slock: getpwnam_shadow: cannot retrieve shadow entry. "
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue