 @@ -1,14 +1,14 @@
-/*	$NetBSD: supcmain.c,v 1.28 2009/10/16 12:41:37 christos Exp $	*/
+/*	$NetBSD: supcmain.c,v 1.29 2009/10/16 22:45:18 christos Exp $	*/
 /*
  * Copyright (c) 1992 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
 @@ -589,27 +589,27 @@ doswitch(int *argc, char ***argv, TREE *
 	*oflagsp &= ~aflags;
 	*aflagsp |= aflags;
 	*aflagsp &= ~oflags;
 	*argc -= optind;
 	*argv += optind;
+}
 static char *
 init(int argc, char **argv)
+{
 	char buf[STRINGLENGTH], *p;
 	const char *u;
 	char username[STRINGLENGTH];
-	char *supfname, **arg;
+	char *supfname, *arg;
 	COLLECTION *c, *lastC;
 	FILE *f;
 	int bogus;
 	struct passwd *pw;
 	TREE *t;
 	TREE *collT;		/* collections we are interested in */
 	time_t timenow;		/* startup time */
 	int oflags, aflags;
 	int cwant;
 #ifdef	MACH
 	void (*oldsigsys) ();
 #endif				/* MACH */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: supcmeat.c,v 1.35 2009/10/16 12:41:37 christos Exp $	*/
+/*	$NetBSD: supcmeat.c,v 1.36 2009/10/16 22:45:18 christos Exp $	*/
 /*
  * Copyright (c) 1992 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
 @@ -1473,27 +1473,27 @@ done(int value, const char *fmt, ...)
 			free(goawayreason);
 		goawayreason = (fmt) ? estrdup(buf) : (char *) NULL;
 		(void) msggoaway();
 	} else {
 		doneack = value;
 		donereason = (fmt) ? buf : (char *) NULL;
 		(void) msgdone();
+	}
 	if (!dontjump)
 		longjmp(sjbuf, TRUE);
+}
 void
-goaway(char *fmt, ...)
+goaway(const char *fmt, ...)
+{
 	char buf[STRINGLENGTH];
 	va_list ap;
 	va_start(ap, fmt);
 	(void) netcrypt((char *) NULL);
 	if (fmt) {
 		vsnprintf(buf, sizeof(buf), fmt, ap);
 		goawayreason = buf;
 	} else
 		goawayreason = NULL;
 	va_end(ap);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: supscan.c,v 1.16 2007/12/20 20:17:52 christos Exp $	*/
+/*	$NetBSD: supscan.c,v 1.17 2009/10/16 22:45:18 christos Exp $	*/
 /*
  * Copyright (c) 1992 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
 @@ -383,27 +383,27 @@ getscancoll(char *filename, char *collna
+		}
 		(void) fclose(f);
+	}
 	if ((c = (SCAN_COLLECTION *) malloc(sizeof(SCAN_COLLECTION))) == NULL)
 		quit(1, "supscan: can't malloc collection structure\n");
 	c->Cname = collname;
 	c->Cbase = basedir;
 	c->Cprefix = prefix;
 	c->Cnext = NULL;
 	return (c);
+}
 void
-goaway(char *fmt, ...)
+goaway(const char *fmt, ...)
+{
 	va_list ap;
 	va_start(ap, fmt);
 	vfprintf(stderr, fmt, ap);
 	va_end(ap);
 	(void) putc('\n', stderr);
 	(void) fflush(stderr);
 	longjmp(sjbuf, TRUE);
+}
 int
 localhost(char *host)