emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Do not check twice if fields[2] and fields[3] are not empty.

Browse Source
This commit is contained in:
nekral-guest
2008-05-26 09:17:17 +00:00
parent adc4729ffa
commit da62edb4e0
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -4,7 +4,8 @@
booleans. booleans.
* lib/sgetpwent.c: Add brackets and parenthesis. * lib/sgetpwent.c: Add brackets and parenthesis.
* lib/sgetpwent.c: Return NULL instead of 0. * lib/sgetpwent.c: Return NULL instead of 0.
* lib/sgetpwent.c: Do not check twice if fields[2] and fields[3]
are not empty.
2008-05-26 Nicolas François <nicolas.francois@centraliens.net> 2008-05-26 Nicolas François <nicolas.francois@centraliens.net>

4
lib/sgetpwent.c
View File

@ -108,11 +108,11 @@ struct passwd *sgetpwent (const char *buf)
pwent.pw_name = fields[0]; pwent.pw_name = fields[0];
pwent.pw_passwd = fields[1]; pwent.pw_passwd = fields[1];
if (fields[2][0] == '\0' || if (
((pwent.pw_uid = strtol (fields[2], &ep, 10)) == 0 && ('\0' != *ep))) { ((pwent.pw_uid = strtol (fields[2], &ep, 10)) == 0 && ('\0' != *ep))) {
return NULL; return NULL;
} }
if (fields[3][0] == '\0' || if (
((pwent.pw_gid = strtol (fields[3], &ep, 10)) == 0 && ('\0' != *ep))) { ((pwent.pw_gid = strtol (fields[3], &ep, 10)) == 0 && ('\0' != *ep))) {
return NULL; return NULL;
} }