rename text() to wrtext(), aligning it with most other output routines,

and avoiding a compile error on powerpc64.

XXX: this tries to make a ".text" symbol, which already exists...

7 files changed, 38 insertions, 38 deletions

diff --git a/backgammon/backgammon/main.c b/backgammon/backgammon/main.c
index a68c67ad..97f10d0e 100644
--- a/backgammon/backgammon/main.c
+++ b/backgammon/backgammon/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.27 2009/08/12 05:17:57 dholland Exp $	*/
+/*	$NetBSD: main.c,v 1.28 2010/03/22 05:10:19 mrg Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\
 #if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: main.c,v 1.27 2009/08/12 05:17:57 dholland Exp $");
+__RCSID("$NetBSD: main.c,v 1.28 2010/03/22 05:10:19 mrg Exp $");
 #endif
 #endif				/* not lint */
 
@@ -133,15 +133,15 @@ main(int argc __unused, char **argv)
 
 	/* check if restored game and save flag for later */
 	if ((rfl = rflag) != 0) {
-		text(message);	/* print message */
-		text(contin);
+		wrtext(message);	/* print message */
+		wrtext(contin);
 		wrboard();	/* print board */
 		/* if new game, pretend to be a non-restored game */
 		if (cturn == 0)
 			rflag = 0;
 	} else {
 		rscore = wscore = 0;	/* zero score */
-		text(message);	/* update message without pausing */
+		wrtext(message);	/* update message without pausing */
 
 		if (aflag) {	/* print rules */
 			writel(rules);
@@ -158,7 +158,7 @@ main(int argc __unused, char **argv)
 				writel(need);
 				if (yorn(0)) {	/* print instructions */
 					clear();
-					text(instr);
+					wrtext(instr);
 				}
 			}
 		}
@@ -223,7 +223,7 @@ main(int argc __unused, char **argv)
 		} else
 			if (!aflag)
 				/* pause to read message */
-				text(contin);
+				wrtext(contin);
 
 		wrboard();	/* print board */
 
@@ -416,7 +416,7 @@ main(int argc __unused, char **argv)
 						curmove(20, 0);
 					else
 						writec('\n');
-					text(helpm);
+					wrtext(helpm);
 					if (tflag)
 						curmove(cturn == -1 ? 
 						    18 : 19, 0);
diff --git a/backgammon/backgammon/text.c b/backgammon/backgammon/text.c
index 2f16baac..b498fb72 100644
--- a/backgammon/backgammon/text.c
+++ b/backgammon/backgammon/text.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: text.c,v 1.8 2005/07/01 01:12:39 jmc Exp $	*/
+/*	$NetBSD: text.c,v 1.9 2010/03/22 05:10:19 mrg Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)text.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: text.c,v 1.8 2005/07/01 01:12:39 jmc Exp $");
+__RCSID("$NetBSD: text.c,v 1.9 2010/03/22 05:10:19 mrg Exp $");
 #endif
 #endif /* not lint */
 
@@ -107,7 +107,7 @@ const char   *const instr[] = {
 0};
 
 int
-text(const char  *const *t)
+wrtext(const char  *const *t)
 {
 	int     i;
 	const char   *s, *a;
diff --git a/backgammon/common_source/back.h b/backgammon/common_source/back.h
index fe8737c6..ed56e81c 100644
--- a/backgammon/common_source/back.h
+++ b/backgammon/common_source/back.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: back.h,v 1.16 2009/08/12 05:17:57 dholland Exp $	*/
+/*	$NetBSD: back.h,v 1.17 2010/03/22 05:10:19 mrg Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -165,7 +165,7 @@ void	recover(const char *);
 void	refresh(void);
 void	roll(void);
 void	save(int);
-int	text(const char *const *);
+int	wrtext(const char *const *);
 void	wrboard(void);
 void	wrhit(int);
 void	wrint(int);
diff --git a/backgammon/common_source/table.c b/backgammon/common_source/table.c
index 869d802e..1c88008d 100644
--- a/backgammon/common_source/table.c
+++ b/backgammon/common_source/table.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: table.c,v 1.10 2009/08/12 05:17:57 dholland Exp $	*/
+/*	$NetBSD: table.c,v 1.11 2010/03/22 05:10:19 mrg Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)table.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: table.c,v 1.10 2009/08/12 05:17:57 dholland Exp $");
+__RCSID("$NetBSD: table.c,v 1.11 2010/03/22 05:10:19 mrg Exp $");
 #endif
 #endif /* not lint */
 
@@ -262,7 +262,7 @@ dotable(int c, int i)
 					curmove(20, 0);
 				else
 					writec('\n');
-				(void) text(help2);
+				(void) wrtext(help2);
 				if (tflag) {
 					curmove(cturn == -1 ? 18 : 19, 39);
 				} else {
diff --git a/backgammon/teachgammon/teach.c b/backgammon/teachgammon/teach.c
index 5c654b3f..9d10908d 100644
--- a/backgammon/teachgammon/teach.c
+++ b/backgammon/teachgammon/teach.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: teach.c,v 1.20 2009/08/12 05:17:57 dholland Exp $	*/
+/*	$NetBSD: teach.c,v 1.21 2010/03/22 05:10:19 mrg Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\
 #if 0
 static char sccsid[] = "@(#)teach.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: teach.c,v 1.20 2009/08/12 05:17:57 dholland Exp $");
+__RCSID("$NetBSD: teach.c,v 1.21 2010/03/22 05:10:19 mrg Exp $");
 #endif
 #endif				/* not lint */
 
@@ -87,9 +87,9 @@ main(int argc __unused, char *argv[])
 		raw.c_oflag &= ~(ONLCR | OXTABS);
 		clear();
 	}
-	text(hello);
-	text(list);
-	i = text(contin);
+	wrtext(hello);
+	wrtext(list);
+	i = wrtext(contin);
 	if (i == 0)
 		i = 2;
 	init();
@@ -99,42 +99,42 @@ main(int argc __unused, char *argv[])
 			leave();
 
 		case 2:
-			if ((i = text(intro1)) != 0)
+			if ((i = wrtext(intro1)) != 0)
 				break;
 			wrboard();
-			if ((i = text(intro2)) != 0)
+			if ((i = wrtext(intro2)) != 0)
 				break;
 
 		case 3:
-			if ((i = text(moves)) != 0)
+			if ((i = wrtext(moves)) != 0)
 				break;
 
 		case 4:
-			if ((i = text(removepiece)) != 0)
+			if ((i = wrtext(removepiece)) != 0)
 				break;
 
 		case 5:
-			if ((i = text(hits)) != 0)
+			if ((i = wrtext(hits)) != 0)
 				break;
 
 		case 6:
-			if ((i = text(endgame)) != 0)
+			if ((i = wrtext(endgame)) != 0)
 				break;
 
 		case 7:
-			if ((i = text(doubl)) != 0)
+			if ((i = wrtext(doubl)) != 0)
 				break;
 
 		case 8:
-			if ((i = text(stragy)) != 0)
+			if ((i = wrtext(stragy)) != 0)
 				break;
 
 		case 9:
-			if ((i = text(prog)) != 0)
+			if ((i = wrtext(prog)) != 0)
 				break;
 
 		case 10:
-			if ((i = text(lastch)) != 0)
+			if ((i = wrtext(lastch)) != 0)
 				break;
 		}
 	tutor();
diff --git a/backgammon/teachgammon/ttext2.c b/backgammon/teachgammon/ttext2.c
index 99e3b49c..2a0d5ee4 100644
--- a/backgammon/teachgammon/ttext2.c
+++ b/backgammon/teachgammon/ttext2.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ttext2.c,v 1.8 2005/07/01 01:12:39 jmc Exp $	*/
+/*	$NetBSD: ttext2.c,v 1.9 2010/03/22 05:10:19 mrg Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)ttext2.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: ttext2.c,v 1.8 2005/07/01 01:12:39 jmc Exp $");
+__RCSID("$NetBSD: ttext2.c,v 1.9 2010/03/22 05:10:19 mrg Exp $");
 #endif
 #endif				/* not lint */
 
@@ -127,7 +127,7 @@ const char   *const lastch[] = {
 
 
 int
-text(const char *const *txt)
+wrtext(const char *const *txt)
 {
 	const char  *const *begin;
 	const char   *a;
@@ -157,7 +157,7 @@ text(const char *const *txt)
 							clear();
 					} else
 						writec('\n');
-					text(list);
+					wrtext(list);
 					writel(prompt);
 					continue;
 				}
diff --git a/backgammon/teachgammon/tutor.c b/backgammon/teachgammon/tutor.c
index a5b0a4c9..d50d051d 100644
--- a/backgammon/teachgammon/tutor.c
+++ b/backgammon/teachgammon/tutor.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tutor.c,v 1.8 2009/08/12 05:17:57 dholland Exp $	*/
+/*	$NetBSD: tutor.c,v 1.9 2010/03/22 05:10:19 mrg Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)tutor.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: tutor.c,v 1.8 2009/08/12 05:17:57 dholland Exp $");
+__RCSID("$NetBSD: tutor.c,v 1.9 2010/03/22 05:10:19 mrg Exp $");
 #endif
 #endif				/* not lint */
 
@@ -89,7 +89,7 @@ tutor(void)
 		}
 		if (tflag)
 			curmove(18, 0);
-		text(*test[i].com);
+		wrtext(*test[i].com);
 		if (!tflag)
 			writec('\n');
 		if (i == maxmoves)