WARNsify...

1 files changed, 136 insertions, 74 deletions

diff --git a/hack/hack.topl.c b/hack/hack.topl.c
index bd671bc5..692e5154 100644
--- a/hack/hack.topl.c
+++ b/hack/hack.topl.c
@@ -1,144 +1,192 @@
+/*	$NetBSD: hack.topl.c,v 1.4 1997/10/19 16:59:10 christos Exp $	*/
+
 /*
  * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static char rcsid[] = "$NetBSD: hack.topl.c,v 1.3 1995/03/23 08:31:40 cgd Exp $";
-#endif /* not lint */
+__RCSID("$NetBSD: hack.topl.c,v 1.4 1997/10/19 16:59:10 christos Exp $");
+#endif				/* not lint */
 
+#include <stdlib.h>
 #include "hack.h"
-#include <stdio.h>
-extern char *eos();
-extern int CO;
+#include "extern.h"
 
-char toplines[BUFSZ];
-xchar tlx, tly;			/* set by pline; used by addtopl */
+char            toplines[BUFSZ];
+xchar           tlx, tly;	/* set by pline; used by addtopl */
 
 struct topl {
-	struct topl *next_topl;
-	char *topl_text;
-} *old_toplines, *last_redone_topl;
+	struct topl    *next_topl;
+	char           *topl_text;
+}              *old_toplines, *last_redone_topl;
 #define	OTLMAX	20		/* max nr of old toplines remembered */
 
-doredotopl(){
-	if(last_redone_topl)
+int
+doredotopl()
+{
+	if (last_redone_topl)
 		last_redone_topl = last_redone_topl->next_topl;
-	if(!last_redone_topl)
+	if (!last_redone_topl)
 		last_redone_topl = old_toplines;
-	if(last_redone_topl){
+	if (last_redone_topl) {
 		(void) strcpy(toplines, last_redone_topl->topl_text);
 	}
 	redotoplin();
-	return(0);
+	return (0);
 }
 
-redotoplin() {
+void
+redotoplin()
+{
 	home();
-	if(index(toplines, '\n')) cl_end();
+	if (strchr(toplines, '\n'))
+		cl_end();
 	putstr(toplines);
 	cl_end();
 	tlx = curx;
 	tly = cury;
 	flags.toplin = 1;
-	if(tly > 1)
+	if (tly > 1)
 		more();
 }
 
-remember_topl() {
-register struct topl *tl;
-register int cnt = OTLMAX;
-	if(last_redone_topl &&
-	   !strcmp(toplines, last_redone_topl->topl_text)) return;
-	if(old_toplines &&
-	   !strcmp(toplines, old_toplines->topl_text)) return;
+void
+remember_topl()
+{
+	struct topl    *tl;
+	int             cnt = OTLMAX;
+	if (last_redone_topl &&
+	    !strcmp(toplines, last_redone_topl->topl_text))
+		return;
+	if (old_toplines &&
+	    !strcmp(toplines, old_toplines->topl_text))
+		return;
 	last_redone_topl = 0;
 	tl = (struct topl *)
-		alloc((unsigned)(strlen(toplines) + sizeof(struct topl) + 1));
+		alloc((unsigned) (strlen(toplines) + sizeof(struct topl) + 1));
 	tl->next_topl = old_toplines;
-	tl->topl_text = (char *)(tl + 1);
+	tl->topl_text = (char *) (tl + 1);
 	(void) strcpy(tl->topl_text, toplines);
 	old_toplines = tl;
-	while(cnt && tl){
+	while (cnt && tl) {
 		cnt--;
 		tl = tl->next_topl;
 	}
-	if(tl && tl->next_topl){
+	if (tl && tl->next_topl) {
 		free((char *) tl->next_topl);
 		tl->next_topl = 0;
 	}
 }
 
-addtopl(s) char *s; {
-	curs(tlx,tly);
-	if(tlx + strlen(s) > CO) putsym('\n');
+void
+addtopl(s)
+	char           *s;
+{
+	curs(tlx, tly);
+	if (tlx + strlen(s) > CO)
+		putsym('\n');
 	putstr(s);
 	tlx = curx;
 	tly = cury;
 	flags.toplin = 1;
 }
 
+void
 xmore(s)
-char *s;	/* allowed chars besides space/return */
+	char           *s;	/* allowed chars besides space/return */
 {
-	if(flags.toplin) {
+	if (flags.toplin) {
 		curs(tlx, tly);
-		if(tlx + 8 > CO) putsym('\n'), tly++;
+		if (tlx + 8 > CO)
+			putsym('\n'), tly++;
 	}
-
-	if(flags.standout)
+	if (flags.standout)
 		standoutbeg();
 	putstr("--More--");
-	if(flags.standout)
+	if (flags.standout)
 		standoutend();
 
 	xwaitforspace(s);
-	if(flags.toplin && tly > 1) {
+	if (flags.toplin && tly > 1) {
 		home();
 		cl_end();
-		docorner(1, tly-1);
+		docorner(1, tly - 1);
 	}
 	flags.toplin = 0;
 }
 
-more(){
+void
+more()
+{
 	xmore("");
 }
 
+void
 cmore(s)
-register char *s;
+	char           *s;
 {
 	xmore(s);
 }
 
-clrlin(){
-	if(flags.toplin) {
+void
+clrlin()
+{
+	if (flags.toplin) {
 		home();
 		cl_end();
-		if(tly > 1) docorner(1, tly-1);
+		if (tly > 1)
+			docorner(1, tly - 1);
 		remember_topl();
 	}
 	flags.toplin = 0;
 }
 
-/*VARARGS1*/
-pline(line,arg1,arg2,arg3,arg4,arg5,arg6)
-register char *line,*arg1,*arg2,*arg3,*arg4,*arg5,*arg6;
+void
+#ifdef __STDC__
+pline(const char *fmt, ...)
+#else
+pline(va_alist)
+	va_dcl
+#endif
 {
-	char pbuf[BUFSZ];
-	register char *bp = pbuf, *tl;
-	register int n,n0;
+	va_list ap;
+#ifndef __STDC__
+	const char *fmt;
+	va_start(ap);
+	fmt = va_arg(ap, const char *);
+#else
+	va_start(ap, fmt);
+#endif
+	vpline(fmt, ap);
+	va_end(ap);
+}
 
-	if(!line || !*line) return;
-	if(!index(line, '%')) (void) strcpy(pbuf,line); else
-	(void) sprintf(pbuf,line,arg1,arg2,arg3,arg4,arg5,arg6);
-	if(flags.toplin == 1 && !strcmp(pbuf, toplines)) return;
-	nscr();		/* %% */
+void
+vpline(line, ap)
+	const char *line;
+	va_list ap;
+{
+	char            pbuf[BUFSZ];
+	char           *bp = pbuf, *tl;
+	int             n, n0;
+
+	if (!line || !*line)
+		return;
+	if (!strchr(line, '%'))
+		(void) strcpy(pbuf, line);
+	else
+		(void) vsprintf(pbuf, line, ap);
+	if (flags.toplin == 1 && !strcmp(pbuf, toplines))
+		return;
+	nscr();			/* %% */
 
 	/* If there is room on the line, print message on same line */
 	/* But messages like "You die..." deserve their own line */
 	n0 = strlen(bp);
-	if(flags.toplin == 1 && tly == 1 &&
-	    n0 + strlen(toplines) + 3 < CO-8 &&  /* leave room for --More-- */
+	if (flags.toplin == 1 && tly == 1 &&
+	    n0 + strlen(toplines) + 3 < CO - 8 &&	/* leave room for
+							 * --More-- */
 	    strncmp(bp, "You ", 4)) {
 		(void) strcat(toplines, "  ");
 		(void) strcat(toplines, bp);
@@ -146,45 +194,55 @@ register char *line,*arg1,*arg2,*arg3,*arg4,*arg5,*arg6;
 		addtopl(bp);
 		return;
 	}
-	if(flags.toplin == 1) more();
+	if (flags.toplin == 1)
+		more();
 	remember_topl();
 	toplines[0] = 0;
-	while(n0){
-		if(n0 >= CO){
+	while (n0) {
+		if (n0 >= CO) {
 			/* look for appropriate cut point */
 			n0 = 0;
-			for(n = 0; n < CO; n++) if(bp[n] == ' ')
-				n0 = n;
-			if(!n0) for(n = 0; n < CO-1; n++)
-				if(!letter(bp[n])) n0 = n;
-			if(!n0) n0 = CO-2;
+			for (n = 0; n < CO; n++)
+				if (bp[n] == ' ')
+					n0 = n;
+			if (!n0)
+				for (n = 0; n < CO - 1; n++)
+					if (!letter(bp[n]))
+						n0 = n;
+			if (!n0)
+				n0 = CO - 2;
 		}
 		(void) strncpy((tl = eos(toplines)), bp, n0);
 		tl[n0] = 0;
 		bp += n0;
 
 		/* remove trailing spaces, but leave one */
-		while(n0 > 1 && tl[n0-1] == ' ' && tl[n0-2] == ' ')
+		while (n0 > 1 && tl[n0 - 1] == ' ' && tl[n0 - 2] == ' ')
 			tl[--n0] = 0;
 
 		n0 = strlen(bp);
-		if(n0 && tl[0]) (void) strcat(tl, "\n");
+		if (n0 && tl[0])
+			(void) strcat(tl, "\n");
 	}
 	redotoplin();
 }
 
-putsym(c) char c; {
-	switch(c) {
+void
+putsym(c)
+	char            c;
+{
+	switch (c) {
 	case '\b':
 		backsp();
 		return;
 	case '\n':
 		curx = 1;
 		cury++;
-		if(cury > tly) tly = cury;
+		if (cury > tly)
+			tly = cury;
 		break;
 	default:
-		if(curx == CO)
+		if (curx == CO)
 			putsym('\n');	/* 1 <= curx <= CO; avoid CO */
 		else
 			curx++;
@@ -192,6 +250,10 @@ putsym(c) char c; {
 	(void) putchar(c);
 }
 
-putstr(s) register char *s; {
-	while(*s) putsym(*s++);
+void
+putstr(s)
+	char           *s;
+{
+	while (*s)
+		putsym(*s++);
 }