From 6a1460f5926ec8aaa136e3e8c39399db281f0dfb Mon Sep 17 00:00:00 2001
From: jsm <jsm@NetBSD.org>
Date: Mon, 13 Sep 1999 17:18:56 +0000
Subject: Fix uses of names of library functions for other purposes.

---
 battlestar/com6.c   |  6 +++---
 battlestar/extern.h |  4 ++--
 battlestar/init.c   |  8 ++++----
 gomoku/gomoku.h     |  4 ++--
 gomoku/main.c       | 14 +++++++-------
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/battlestar/com6.c b/battlestar/com6.c
index 63b871b3..95f18d71 100644
--- a/battlestar/com6.c
+++ b/battlestar/com6.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com6.c,v 1.13 1999/09/13 17:15:42 jsm Exp $	*/
+/*	$NetBSD: com6.c,v 1.14 1999/09/13 17:18:56 jsm Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)com6.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: com6.c,v 1.13 1999/09/13 17:15:42 jsm Exp $");
+__RCSID("$NetBSD: com6.c,v 1.14 1999/09/13 17:18:56 jsm Exp $");
 #endif
 #endif				/* not lint */
 
@@ -134,7 +134,7 @@ post(ch)
 	date = ctime(&tvsec);
 	date[24] = '\0';
 	if (score_fp != NULL) {
-		fprintf(score_fp, "%s  %8s  %c%20s", date, uname, ch, rate());
+		fprintf(score_fp, "%s  %8s  %c%20s", date, username, ch, rate());
 		if (wiz)
 			fprintf(score_fp, "   wizard\n");
 		else
diff --git a/battlestar/extern.h b/battlestar/extern.h
index a7f02261..f431dd46 100644
--- a/battlestar/extern.h
+++ b/battlestar/extern.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: extern.h,v 1.12 1999/07/28 01:45:42 hubertf Exp $ */
+/*	$NetBSD: extern.h,v 1.13 1999/09/13 17:18:57 jsm Exp $ */
 
 /*
  * Copyright (c) 1983, 1993
@@ -283,7 +283,7 @@ unsigned int wear[NUMOFWORDS];
 char    beenthere[NUMOFROOMS + 1];
 char    injuries[NUMOFINJURIES];
 
-char    uname[9];
+char    username[9];
 
 struct wlist {
 	const char   *string;
diff --git a/battlestar/init.c b/battlestar/init.c
index 94d87309..003e0cc8 100644
--- a/battlestar/init.c
+++ b/battlestar/init.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: init.c,v 1.9 1999/07/28 01:45:43 hubertf Exp $	*/
+/*	$NetBSD: init.c,v 1.10 1999/09/13 17:18:57 jsm Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)init.c	8.4 (Berkeley) 4/30/95";
 #else
-__RCSID("$NetBSD: init.c,v 1.9 1999/07/28 01:45:43 hubertf Exp $");
+__RCSID("$NetBSD: init.c,v 1.10 1999/09/13 17:18:57 jsm Exp $");
 #endif
 #endif				/* not lint */
 
@@ -56,7 +56,7 @@ initialize(filename)
 	puts("Admiral D.W. Riggle\n");
 	location = dayfile;
 	srand(getpid());
-	getutmp(uname);
+	getutmp(username);
 	wordinit();
 	if (filename == NULL) {
 		direction = NORTH;
@@ -73,7 +73,7 @@ initialize(filename)
 		restore(savefile);
 		free(savefile);
 	}
-	wiz = wizard(uname);
+	wiz = wizard(username);
 	signal(SIGINT, diesig);
 }
 
diff --git a/gomoku/gomoku.h b/gomoku/gomoku.h
index 84ccd471..61553436 100644
--- a/gomoku/gomoku.h
+++ b/gomoku/gomoku.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: gomoku.h,v 1.6 1999/09/08 21:17:49 jsm Exp $	*/
+/*	$NetBSD: gomoku.h,v 1.7 1999/09/13 17:18:57 jsm Exp $	*/
 
 /*
  * Copyright (c) 1994
@@ -276,7 +276,7 @@ void	cursfini __P((void));
 void	cursinit __P((void));
 void	bdwho __P((int));
 void	panic __P((const char *)) __attribute__((__noreturn__));
-void	log __P((const char *));
+void	glog __P((const char *));
 void	dlog __P((const char *));
 void	quit __P((void)) __attribute__((__noreturn__));
 void	quitsig __P((int)) __attribute__((__noreturn__));
diff --git a/gomoku/main.c b/gomoku/main.c
index 7b8fc674..36f384db 100644
--- a/gomoku/main.c
+++ b/gomoku/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.8 1999/09/12 09:02:21 jsm Exp $	*/
+/*	$NetBSD: main.c,v 1.9 1999/09/13 17:18:58 jsm Exp $	*/
 
 /*
  * Copyright (c) 1994
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1994\n\
 #if 0
 static char sccsid[] = "@(#)main.c	8.4 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: main.c,v 1.8 1999/09/12 09:02:21 jsm Exp $");
+__RCSID("$NetBSD: main.c,v 1.9 1999/09/13 17:18:58 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -262,7 +262,7 @@ again:
 					ask("save file name? ");
 					(void)getline(buf, sizeof(buf));
 					if ((fp = fopen(buf, "w")) == NULL) {
-						log("cannot create save file");
+						glog("cannot create save file");
 						goto getinput;
 					}
 					for (i = 0; i < movenum - 1; i++)
@@ -273,7 +273,7 @@ again:
 				}
 				if (curmove != RESIGN &&
 				    board[curmove].s_occ != EMPTY) {
-					log("Illegal move");
+					glog("Illegal move");
 					goto getinput;
 				}
 			}
@@ -285,7 +285,7 @@ again:
 		}
 		if (interactive) {
 			sprintf(fmtbuf, fmt[color], movenum, stoc(curmove));
-			log(fmtbuf);
+			glog(fmtbuf);
 		}
 		if ((i = makemove(color, curmove)) != MOVEOK)
 			break;
@@ -322,7 +322,7 @@ again:
 				ask("save file name? ");
 				(void)getline(buf, sizeof(buf));
 				if ((fp = fopen(buf, "w")) == NULL) {
-					log("cannot create save file");
+					glog("cannot create save file");
 					goto replay;
 				}
 				for (i = 0; i < movenum - 1; i++)
@@ -512,7 +512,7 @@ dlog(str)
 }
 
 void
-log(str)
+glog(str)
 	const char *str;
 {
 
-- 
cgit v1.2.3-56-ge451