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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-23 11:21:57 +0000 (Thu, 23 Apr 2009)
New Revision: 2769

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/grpck.c
Log:
	* src/grpck.c: Ignore puts return value.
	* src/grpck.c: Avoid variable format string.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-23 11:21:01 UTC (rev 2768)
+++ upstream/trunk/ChangeLog	2009-04-23 11:21:57 UTC (rev 2769)
@@ -1,5 +1,10 @@
 2009-04-22  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/grpck.c: Ignore puts return value.
+	* src/grpck.c: Avoid variable format string.
+
+2009-04-22  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/lastlog.c: Use EXIT_FAILURE / EXIT_SUCCESS for exit()
 	* src/lastlog.c: Added splint annotations.
 	* src/lastlog.c: Avoid global pwent.

Modified: upstream/trunk/src/grpck.c
===================================================================
--- upstream/trunk/src/grpck.c	2009-04-23 11:21:01 UTC (rev 2768)
+++ upstream/trunk/src/grpck.c	2009-04-23 11:21:57 UTC (rev 2769)
@@ -467,7 +467,7 @@
 			 * Tell the user this entire line is bogus and ask
 			 * them to delete it.
 			 */
-			puts (_("invalid group file entry"));
+			(void) puts (_("invalid group file entry"));
 			printf (_("delete line '%s'? "), gre->line);
 			*errors += 1;
 
@@ -527,7 +527,7 @@
 			 * Tell the user this entry is a duplicate of
 			 * another and ask them to delete it.
 			 */
-			puts (_("duplicate group entry"));
+			(void) puts (_("duplicate group entry"));
 			printf (_("delete line '%s'? "), gre->line);
 			*errors += 1;
 
@@ -660,7 +660,7 @@
 			 * Tell the user this entire line is bogus and ask
 			 * them to delete it.
 			 */
-			puts (_("invalid shadow group file entry"));
+			(void) puts (_("invalid shadow group file entry"));
 			printf (_("delete line '%s'? "), sge->line);
 			*errors += 1;
 
@@ -720,7 +720,7 @@
 			 * Tell the user this entry is a duplicate of
 			 * another and ask them to delete it.
 			 */
-			puts (_("duplicate shadow group entry"));
+			(void) puts (_("duplicate shadow group entry"));
 			printf (_("delete line '%s'? "), sge->line);
 			*errors += 1;
 
@@ -833,9 +833,11 @@
 	 * Tell the user what we did and exit.
 	 */
 	if (0 != errors) {
-		printf (changed ?
-		        _("%s: the files have been updated\n") :
-		        _("%s: no changes\n"), Prog);
+		if (changed) {
+			printf (_("%s: the files have been updated\n"), Prog);
+		} else {
+			printf (_("%s: no changes\n"), Prog);
+		}
 	}
 
 	exit ((0 != errors) ? E_BAD_ENTRY : E_OKAY);