From 75f4b049a646e84aee600c9559ecd224c343b3f6 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Thu, 16 Jun 2011 21:25:36 +0000 Subject: [PATCH] * libmisc/isexpired.c: Added parenthesis. * libmisc/env.c: Added comments. * libmisc/env.c: Avoid implicit conversion of pointer to boolean. --- ChangeLog | 6 ++++++ libmisc/env.c | 14 ++++++++++++-- libmisc/isexpired.c | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a62f68c..d7f05c6f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-06-16 Nicolas François + + * libmisc/isexpired.c: Added parenthesis. + * libmisc/env.c: Added comments. + * libmisc/env.c: Avoid implicit conversion of pointer to boolean. + 2011-06-16 Nicolas François * src/su.c: environ is provided by . diff --git a/libmisc/env.c b/libmisc/env.c index 056602c4..0b7c148f 100644 --- a/libmisc/env.c +++ b/libmisc/env.c @@ -115,6 +115,9 @@ void addenv (const char *string, /*@null@*/const char *value) n = (size_t) (cp - newstring); + /* + * If this environment variable is already set, change its value. + */ for (i = 0; i < newenvc; i++) { if ( (strncmp (newstring, newenvp[i], n) == 0) && (('=' == newenvp[i][n]) || ('\0' == newenvp[i][n]))) { @@ -128,8 +131,15 @@ void addenv (const char *string, /*@null@*/const char *value) return; } + /* + * Otherwise, save the new environment variable + */ newenvp[newenvc++] = newstring; + /* + * And extend the environment if needed. + */ + /* * Check whether newenvc is a multiple of NEWENVP_STEP. * If so we have to resize the vector. @@ -143,14 +153,14 @@ void addenv (const char *string, /*@null@*/const char *value) size_t newsize; /* - * If the resize operation succeds we can + * If the resize operation succeeds we can * happily go on, else print a message. */ newsize = (newenvc + NEWENVP_STEP) * sizeof (char *); __newenvp = (char **) realloc (newenvp, newsize); - if (__newenvp) { + if (NULL != __newenvp) { /* * If this is our current environment, update * environ so that it doesn't point to some diff --git a/libmisc/isexpired.c b/libmisc/isexpired.c index 416a21e4..8e8a645f 100644 --- a/libmisc/isexpired.c +++ b/libmisc/isexpired.c @@ -107,7 +107,7 @@ int isexpired (const struct passwd *pw, /*@null@*/const struct spwd *sp) if ( (-1 == sp->sp_lstchg) || (-1 == sp->sp_max) - || (sp->sp_max >= (10000L * DAY / SCALE))) { + || (sp->sp_max >= ((10000L * DAY) / SCALE))) { return 0; }