- rename getchar to lgetchar to avoid conflicts with the stdio getchar

- fix redundant decls and nested externs
- use snprintf instead of sprintf

1 files changed, 10 insertions, 10 deletions

diff --git a/larn/store.c b/larn/store.c
index fce6efc3..837edf71 100644
--- a/larn/store.c
+++ b/larn/store.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: store.c,v 1.7 1998/08/30 09:19:38 veego Exp $	 */
+/*	$NetBSD: store.c,v 1.8 2001/02/05 00:57:34 christos Exp $	 */
 
 /*-
  * Copyright (c) 1988 The Regents of the University of California.
@@ -38,7 +38,7 @@
 #if 0
 static char     sccsid[] = "@(#)store.c	5.4 (Berkeley) 5/13/91";
 #else
-__RCSID("$NetBSD: store.c,v 1.7 1998/08/30 09:19:38 veego Exp $");
+__RCSID("$NetBSD: store.c,v 1.8 2001/02/05 00:57:34 christos Exp $");
 #endif
 #endif				/* not lint */
 
@@ -253,7 +253,7 @@ dndstore()
 		lflush();
 		i = 0;
 		while (i != '\33')
-			i = getchar();
+			i = lgetchar();
 		drawscreen();
 		nosignal = 0;	/* enable signals */
 		return;
@@ -271,7 +271,7 @@ dndstore()
 		lprcat(" to leave]? ");
 		i = 0;
 		while ((i < 'a' || i > 'z') && (i != ' ') && (i != '\33') && (i != 12))
-			i = getchar();
+			i = lgetchar();
 		if (i == 12) {
 			clear();
 			dnd_2hed();
@@ -406,7 +406,7 @@ oschool()
 		yrepcount = 0;
 		i = 0;
 		while ((i < 'a' || i > 'h') && (i != '\33') && (i != 12))
-			i = getchar();
+			i = lgetchar();
 		if (i == 12) {
 			sch_hed();
 			continue;
@@ -545,7 +545,7 @@ banktitle(str)
 		lflush();
 		i = 0;
 		while (i != '\33')
-			i = getchar();
+			i = lgetchar();
 		drawscreen();
 		nosignal = 0;	/* enable signals */
 		return;
@@ -626,7 +626,7 @@ obanksub()
 		yrepcount = 0;
 		i = 0;
 		while (i != 'd' && i != 'w' && i != 's' && i != '\33')
-			i = getchar();
+			i = lgetchar();
 		switch (i) {
 		case 'd':
 			lprcat("deposit\nHow much? ");
@@ -664,7 +664,7 @@ obanksub()
 			lprcat("\nWhich stone would you like to sell? ");
 			i = 0;
 			while ((i < 'a' || i > 'z') && i != '*')
-				i = getchar();
+				i = lgetchar();
 			if (i == '*')
 				for (i = 0; i < 26; i++) {
 					if (gemvalue[i]) {
@@ -770,7 +770,7 @@ otradepost()
 		lprcat("] ? ");
 		i = 0;
 		while (i > 'z' || (i < 'a' && i != '*' && i != '\33' && i != '.'))
-			i = getchar();
+			i = lgetchar();
 		if (i == '\33') {
 			setscroll();
 			recalc();
@@ -874,7 +874,7 @@ olrs()
 		yrepcount = 0;
 		i = 0;
 		while (i != 'p' && i != '\33')
-			i = getchar();
+			i = lgetchar();
 		switch (i) {
 		case 'p':
 			lprcat("pay taxes\nHow much? ");