From da62edb4e077c519f2a515c6c7addad74fd0baff Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Mon, 26 May 2008 09:17:17 +0000 Subject: [PATCH] Do not check twice if fields[2] and fields[3] are not empty. --- ChangeLog | 3 ++- lib/sgetpwent.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1274326d..08c9a2fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,7 +4,8 @@ booleans. * lib/sgetpwent.c: Add brackets and parenthesis. * 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 diff --git a/lib/sgetpwent.c b/lib/sgetpwent.c index 3648e60c..7e38c6c9 100644 --- a/lib/sgetpwent.c +++ b/lib/sgetpwent.c @@ -108,11 +108,11 @@ struct passwd *sgetpwent (const char *buf) pwent.pw_name = fields[0]; pwent.pw_passwd = fields[1]; - if (fields[2][0] == '\0' || + if ( ((pwent.pw_uid = strtol (fields[2], &ep, 10)) == 0 && ('\0' != *ep))) { return NULL; } - if (fields[3][0] == '\0' || + if ( ((pwent.pw_gid = strtol (fields[3], &ep, 10)) == 0 && ('\0' != *ep))) { return NULL; }