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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-08-31 17:28:12 +0000 (Sun, 31 Aug 2008)
New Revision: 2316

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/grpconv.c
Log:
	* src/grpconv.c, src/groups.c: Name the parameters in the
	prototypes of the static functions.
	* src/grpconv.c: Fail if unexpected parameters are provided.
	* src/grpconv.c: Indicate that argc is not used in the no
	SHADOWGRP version.

Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-08-31 17:28:03 UTC (rev 2315)
+++ upstream/trunk/ChangeLog	2008-08-31 17:28:12 UTC (rev 2316)
@@ -1,5 +1,13 @@
 2008-08-28  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/grpconv.c, src/groups.c: Name the parameters in the
+	prototypes of the static functions.
+	* src/grpconv.c: Fail if unexpected parameters are provided.
+	* src/grpconv.c: Indicate that argc is not used in the no
+	SHADOWGRP version.
+
+2008-08-28  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/chgpasswd.c, src/chpasswd.c: Removed variable ok, which is
 	no more used.
 

Modified: upstream/trunk/src/grpconv.c
===================================================================
--- upstream/trunk/src/grpconv.c	2008-08-31 17:28:03 UTC (rev 2315)
+++ upstream/trunk/src/grpconv.c	2008-08-31 17:28:12 UTC (rev 2316)
@@ -58,7 +58,7 @@
 static char *Prog;
 
 /* local function prototypes */
-static void fail_exit (int);
+static void fail_exit (int status);
 
 static void fail_exit (int status)
 {
@@ -88,6 +88,9 @@
 	const struct sgrp *sg;
 	struct sgrp sgent;
 
+	if (1 != argc) {
+		(void) fputs (_("Usage: grpconv\n"), stderr);
+	}
 	Prog = Basename (argv[0]);
 
 	(void) setlocale (LC_ALL, "");
@@ -218,7 +221,7 @@
 	return 0;
 }
 #else				/* !SHADOWGRP */
-int main (int argc, char **argv)
+int main (int unused(argc), char **argv)
 {
 	fprintf (stderr,
 		 "%s: not configured for shadow group support.\n", argv[0]);