From Anon Ymous:

- add __unused - fix volatile
2006-12-20 16:33:34 +00:00 · 2006-12-20 16:33:34 +00:00 · c20e20ce2a
parent be0d7b99e3
commit c20e20ce2a
9 changed files with 33 additions and 36 deletions
--- a/usr.sbin/sup/Makefile.inc
+++ b/usr.sbin/sup/Makefile.inc
@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.9 2006/08/26 18:15:39 christos Exp $
+#	$NetBSD: Makefile.inc,v 1.10 2006/12/20 16:33:34 christos Exp $

 .include <bsd.own.mk>

@ -7,6 +7,8 @@ CPPFLAGS+=-UCMUCS -UCMU -UMACH -DVAR_TMP -DHAS_DAEMON -DHAS_POSIX_DIR \
 CPPFLAGS+=-I${.CURDIR}/../source -I${.CURDIR}/../lib -I${.CURDIR}/../sys
 CPPFLAGS+=-DEE_XXX

+CWARNFLAGS+=-Wextra
+
 LIBSUPDIR != cd ${.CURDIR}/../lib && ${PRINTOBJDIR}
 LIBSUP=	${LIBSUPDIR}/libsup.a
 SUPLIB=	-L${LIBSUPDIR} -lsup
--- a/usr.sbin/sup/source/netcryptvoid.c
+++ b/usr.sbin/sup/source/netcryptvoid.c
@ -1,4 +1,4 @@
-/*	$NetBSD: netcryptvoid.c,v 1.8 2002/07/10 20:19:40 wiz Exp $	*/
+/*	$NetBSD: netcryptvoid.c,v 1.9 2006/12/20 16:33:34 christos Exp $	*/

 /*
 * Copyright (c) 1992 Carnegie Mellon University
@ -68,7 +68,7 @@ netcrypt(char *pword)
 }

 int 
-getcryptbuf(int x)
+getcryptbuf(int x __unused)
 {
 	if (cryptflag == 0) {
 		return (SCMOK);
@ -77,12 +77,12 @@ getcryptbuf(int x)
 }

 void 
-decode(char *in, char *out, int count)
+decode(char *in __unused, char *out __unused, int count __unused)
 {
 }


 void 
-encode(char *in, char *out, int count)
+encode(char *in __unused, char *out __unused, int count __unused)
 {
 }
--- a/usr.sbin/sup/source/scan.c
+++ b/usr.sbin/sup/source/scan.c
@ -1,4 +1,4 @@
-/*	$NetBSD: scan.c,v 1.22 2006/04/02 01:39:48 christos Exp $	*/
+/*	$NetBSD: scan.c,v 1.23 2006/12/20 16:33:34 christos Exp $	*/

 /*
 * Copyright (c) 1992 Carnegie Mellon University
@ -381,7 +381,7 @@ makescanlists(void)
 }

 static int
-scanone(TREE * t, void *v)
+scanone(TREE * t, void *v __unused)
 {
 	TREE *newt;

@ -584,7 +584,7 @@ expTinsert(char *p, TREE ** t, int flags, char *exec)
 }

 static int
-listone(TREE * t, void *v)
+listone(TREE * t, void *v __unused)
 {				/* expand and add one name from upgrade list */
 	listentry(t->Tname, t->Tname, (char *) NULL, (t->Tflags & FALWAYS) != 0);
 	return (SCMOK);
--- a/usr.sbin/sup/source/stree.c
+++ b/usr.sbin/sup/source/stree.c
@ -1,4 +1,4 @@
-/*	$NetBSD: stree.c,v 1.10 2006/04/13 21:48:54 christos Exp $	*/
+/*	$NetBSD: stree.c,v 1.11 2006/12/20 16:33:34 christos Exp $	*/

 /*
 * Copyright (c) 1992 Carnegie Mellon University
@ -337,7 +337,7 @@ Tprocess(TREE * t, int (*f) (TREE *, void *), void *args)
 }

 static int 
-Tprintone(TREE * t, void *v)
+Tprintone(TREE * t, void *v __unused)
 {
 	int i;
 	for (i = 0; i < (process_level * 2); i++)
--- a/usr.sbin/sup/source/supcmain.c
+++ b/usr.sbin/sup/source/supcmain.c
@ -1,4 +1,4 @@
-/*	$NetBSD: supcmain.c,v 1.21 2006/04/02 01:39:48 christos Exp $	*/
+/*	$NetBSD: supcmain.c,v 1.22 2006/12/20 16:33:34 christos Exp $	*/

 /*
 * Copyright (c) 1992 Carnegie Mellon University
@ -725,7 +725,7 @@ init(int argc, char **argv)
 }

 static int
-checkcoll(TREE * t, void *dummy)
+checkcoll(TREE * t, void *dummy __unused)
 {
 	if (!t->Twant)
 		return (SCMOK);
--- a/usr.sbin/sup/source/supcmeat.c
+++ b/usr.sbin/sup/source/supcmeat.c
@ -1,4 +1,4 @@
-/*	$NetBSD: supcmeat.c,v 1.30 2006/04/02 01:39:48 christos Exp $	*/
+/*	$NetBSD: supcmeat.c,v 1.31 2006/12/20 16:33:34 christos Exp $	*/

 /*
 * Copyright (c) 1992 Carnegie Mellon University
@ -540,7 +540,7 @@ listfiles(void)
 }

 static int 
-needone(TREE * t, void *dummy)
+needone(TREE * t, void *dummy __unused)
 {
 	TREE *newt;
 	int exists, fetch;
@ -592,14 +592,14 @@ needone(TREE * t, void *dummy)
 }

 static int 
-denyone(TREE * t, void *v)
+denyone(TREE * t, void *v __unused)
 {
 	vnotify("SUP: Access denied to %s\n", t->Tname);
 	return (SCMOK);
 }

 static int 
-deleteone(TREE * t, void *v)
+deleteone(TREE * t, void *v __unused)
 {
 	struct stat sbuf, pbuf;
 	int x;
@ -1074,7 +1074,7 @@ linkone(TREE * t, void *fv)
 }

 static int 
-execone(TREE * t, void *v)
+execone(TREE * t, void *v __unused)
 {				/* execute command for file */
 	int w;

--- a/usr.sbin/sup/source/supfilesrv.c
+++ b/usr.sbin/sup/source/supfilesrv.c
@ -1,4 +1,4 @@
-/*	$NetBSD: supfilesrv.c,v 1.36 2006/05/10 21:45:40 mrg Exp $	*/
+/*	$NetBSD: supfilesrv.c,v 1.37 2006/12/20 16:33:34 christos Exp $	*/

 /*
 * Copyright (c) 1992 Carnegie Mellon University
@ -478,7 +478,7 @@ main(int argc, char **argv)
 */

 void
-chldsig(int snum)
+chldsig(int snum __unused)
 {
 	int w;

@ -1159,7 +1159,7 @@ listfiles(void)


 int
-denyone(TREE * t, void *v)
+denyone(TREE * t, void *v __unused)
 {
 	TREELIST *tl;
 	char *name = t->Tname;
@ -1261,7 +1261,7 @@ sendfiles(void)
 }

 int
-sendone(TREE * t, void *v)
+sendone(TREE * t, void *v __unused)
 {
 	int x, fd;
 	char temp_file[STRINGLENGTH];
@ -1393,7 +1393,7 @@ sendone(TREE * t, void *v)
 }

 int
-senddir(TREE * t, void *v)
+senddir(TREE * t, void *v __unused)
 {
 	int x;

@ -1991,7 +1991,7 @@ link_nofollow(int on)
 #else				/* MACH */
 /*ARGSUSED*/
 int
-link_nofollow(int on)
+link_nofollow(int on __unused)
 {
 	return (0);
 }
--- a/usr.sbin/sup/source/supmsg.c
+++ b/usr.sbin/sup/source/supmsg.c
@ -1,4 +1,4 @@
-/*	$NetBSD: supmsg.c,v 1.14 2006/03/22 16:45:48 christos Exp $	*/
+/*	$NetBSD: supmsg.c,v 1.15 2006/12/20 16:33:35 christos Exp $	*/

 /*
 * Copyright (c) 1992 Carnegie Mellon University
@ -323,7 +323,7 @@ msglogack(void)
 extern TREE *refuseT;		/* tree of files to refuse */

 static int 
-refuseone(TREE * t, void *v)
+refuseone(TREE * t, void *v __unused)
 {
 	return (writestring(t->Tname));
 }
@ -365,7 +365,7 @@ extern TREE *listT;		/* tree of files to list */
 extern time_t scantime;		/* time that collection was scanned */

 static int 
-listone(TREE * t, void *v)
+listone(TREE * t, void *v __unused)
 {
 	int x;

@ -430,7 +430,7 @@ msglist(void)
 extern TREE *needT;		/* tree of files to need */

 static int 
-needone(TREE * t, void *v)
+needone(TREE * t, void *v __unused)
 {
 	int x;
 	x = writestring(t->Tname);
@ -481,7 +481,7 @@ msgneed(void)
 extern TREE *denyT;		/* tree of files to deny */

 static int 
-denyone(TREE * t, void *v)
+denyone(TREE * t, void *v __unused)
 {
 	return (writestring(t->Tname));
 }
@ -532,7 +532,7 @@ msgsend(void)
 extern TREE *upgradeT;		/* pointer to file being upgraded */

 static int 
-writeone(TREE * t, void *v)
+writeone(TREE * t, void *v __unused)
 {
 	return (writestring(t->Tname));
 }
--- a/usr.sbin/sup/source/supscan.c
+++ b/usr.sbin/sup/source/supscan.c
@ -1,4 +1,4 @@
-/*	$NetBSD: supscan.c,v 1.14 2006/04/02 01:39:48 christos Exp $	*/
+/*	$NetBSD: supscan.c,v 1.15 2006/12/20 16:33:35 christos Exp $	*/

 /*
 * Copyright (c) 1992 Carnegie Mellon University
@ -170,7 +170,7 @@ int main(int, char **);
 int
 main(int argc, char **argv)
 {
-	SCAN_COLLECTION *c;
+	SCAN_COLLECTION * volatile c;	/* Avoid longjmp clobbering */
 #ifdef RLIMIT_DATA
 	struct rlimit dlim;

@ -185,11 +185,6 @@ main(int argc, char **argv)
 	}
 #endif

-#if __GNUC__
-	/* Avoid longjmp clobbering */
-	(void) &c;
-#endif
-
 	init(argc, argv);	/* process arguments */
 	for (c = firstC; c; c = c->Cnext) {
 		collname = c->Cname;