From 2b92b0f3054e585a640cab3645ccc3c6e3b62a70 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Mon, 9 Jun 2008 20:36:24 +0000 Subject: [PATCH] * src/expiry.c: Ignore return value of setlocale(), bindtextdomain(), and textdomain(). * src/expiry.c: Add brackets and parenthesis. * src/expiry.c: Avoid assignments in comparisons. * src/expiry.c: Avoid implicit conversion of pointers to booleans. --- ChangeLog | 8 ++++++++ src/expiry.c | 15 ++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4161c9b7..cdbdc9c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-06-09 Nicolas François + + * src/expiry.c: Ignore return value of setlocale(), + bindtextdomain(), and textdomain(). + * src/expiry.c: Add brackets and parenthesis. + * src/expiry.c: Avoid assignments in comparisons. + * src/expiry.c: Avoid implicit conversion of pointers to booleans. + 2008-06-09 Nicolas François * src/pwunconv.c: Use a bool when possible instead of int diff --git a/src/expiry.c b/src/expiry.c index be5974a8..ab4cb095 100644 --- a/src/expiry.c +++ b/src/expiry.c @@ -90,17 +90,21 @@ int main (int argc, char **argv) * expiry takes one of two arguments. The default action is to give * the usage message. */ - setlocale (LC_ALL, ""); - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); + (void) setlocale (LC_ALL, ""); + (void) bindtextdomain (PACKAGE, LOCALEDIR); + (void) textdomain (PACKAGE); - if (argc != 2 || (strcmp (argv[1], "-f") && strcmp (argv[1], "-c"))) + if ( (argc != 2) + || ( (strcmp (argv[1], "-f") != 0) + && (strcmp (argv[1], "-c") != 0))) { usage (); + } /* * Get user entries for /etc/passwd and /etc/shadow */ - if (!(pwd = get_my_pwent ())) { + pwd = get_my_pwent (); + if (NULL == pwd) { fprintf (stderr, _("%s: unknown user\n"), Prog); exit (10); } @@ -142,3 +146,4 @@ int main (int argc, char **argv) usage (); exit (1); } +