[Pkg-shadow-commits] r2090 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-06-09 20:36:24 +0000 (Mon, 09 Jun 2008)
New Revision: 2090

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/expiry.c
Log:
	* 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.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-06-09 20:32:17 UTC (rev 2089)
+++ upstream/trunk/ChangeLog	2008-06-09 20:36:24 UTC (rev 2090)
@@ -1,5 +1,13 @@
 2008-06-09  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* 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  <nicolas.francois at centraliens.net>
+
 	* src/pwunconv.c: Use a bool when possible instead of int
 	integers.
 	* src/pwunconv.c: Add brackets and parenthesis.

Modified: upstream/trunk/src/expiry.c
===================================================================
--- upstream/trunk/src/expiry.c	2008-06-09 20:32:17 UTC (rev 2089)
+++ upstream/trunk/src/expiry.c	2008-06-09 20:36:24 UTC (rev 2090)
@@ -90,17 +90,21 @@
 	 * 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 @@
 	usage ();
 	exit (1);
 }
+