Module Name: src
Committed By: mrg
Date: Mon Mar 22 05:10:19 UTC 2010
Modified Files:
src/games/backgammon/backgammon: main.c text.c
src/games/backgammon/common_source: back.h table.c
src/games/backgammon/teachgammon: teach.c ttext2.c tutor.c
Log Message:
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...
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/games/backgammon/backgammon/main.c
cvs rdiff -u -r1.8 -r1.9 src/games/backgammon/backgammon/text.c
cvs rdiff -u -r1.16 -r1.17 src/games/backgammon/common_source/back.h
cvs rdiff -u -r1.10 -r1.11 src/games/backgammon/common_source/table.c
cvs rdiff -u -r1.20 -r1.21 src/games/backgammon/teachgammon/teach.c
cvs rdiff -u -r1.8 -r1.9 src/games/backgammon/teachgammon/ttext2.c \
src/games/backgammon/teachgammon/tutor.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/backgammon/backgammon/main.c
diff -u src/games/backgammon/backgammon/main.c:1.27 src/games/backgammon/backgammon/main.c:1.28
--- src/games/backgammon/backgammon/main.c:1.27 Wed Aug 12 05:17:57 2009
+++ src/games/backgammon/backgammon/main.c Mon Mar 22 05:10:19 2010
@@ -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 @@
#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 @@
/* 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 @@
writel(need);
if (yorn(0)) { /* print instructions */
clear();
- text(instr);
+ wrtext(instr);
}
}
}
@@ -223,7 +223,7 @@
} else
if (!aflag)
/* pause to read message */
- text(contin);
+ wrtext(contin);
wrboard(); /* print board */
@@ -416,7 +416,7 @@
curmove(20, 0);
else
writec('\n');
- text(helpm);
+ wrtext(helpm);
if (tflag)
curmove(cturn == -1 ?
18 : 19, 0);
Index: src/games/backgammon/backgammon/text.c
diff -u src/games/backgammon/backgammon/text.c:1.8 src/games/backgammon/backgammon/text.c:1.9
--- src/games/backgammon/backgammon/text.c:1.8 Fri Jul 1 01:12:39 2005
+++ src/games/backgammon/backgammon/text.c Mon Mar 22 05:10:19 2010
@@ -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 @@
0};
int
-text(const char *const *t)
+wrtext(const char *const *t)
{
int i;
const char *s, *a;
Index: src/games/backgammon/common_source/back.h
diff -u src/games/backgammon/common_source/back.h:1.16 src/games/backgammon/common_source/back.h:1.17
--- src/games/backgammon/common_source/back.h:1.16 Wed Aug 12 05:17:57 2009
+++ src/games/backgammon/common_source/back.h Mon Mar 22 05:10:19 2010
@@ -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 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);
Index: src/games/backgammon/common_source/table.c
diff -u src/games/backgammon/common_source/table.c:1.10 src/games/backgammon/common_source/table.c:1.11
--- src/games/backgammon/common_source/table.c:1.10 Wed Aug 12 05:17:57 2009
+++ src/games/backgammon/common_source/table.c Mon Mar 22 05:10:19 2010
@@ -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 @@
curmove(20, 0);
else
writec('\n');
- (void) text(help2);
+ (void) wrtext(help2);
if (tflag) {
curmove(cturn == -1 ? 18 : 19, 39);
} else {
Index: src/games/backgammon/teachgammon/teach.c
diff -u src/games/backgammon/teachgammon/teach.c:1.20 src/games/backgammon/teachgammon/teach.c:1.21
--- src/games/backgammon/teachgammon/teach.c:1.20 Wed Aug 12 05:17:57 2009
+++ src/games/backgammon/teachgammon/teach.c Mon Mar 22 05:10:19 2010
@@ -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 @@
#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 @@
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 @@
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();
Index: src/games/backgammon/teachgammon/ttext2.c
diff -u src/games/backgammon/teachgammon/ttext2.c:1.8 src/games/backgammon/teachgammon/ttext2.c:1.9
--- src/games/backgammon/teachgammon/ttext2.c:1.8 Fri Jul 1 01:12:39 2005
+++ src/games/backgammon/teachgammon/ttext2.c Mon Mar 22 05:10:19 2010
@@ -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 @@
int
-text(const char *const *txt)
+wrtext(const char *const *txt)
{
const char *const *begin;
const char *a;
@@ -157,7 +157,7 @@
clear();
} else
writec('\n');
- text(list);
+ wrtext(list);
writel(prompt);
continue;
}
Index: src/games/backgammon/teachgammon/tutor.c
diff -u src/games/backgammon/teachgammon/tutor.c:1.8 src/games/backgammon/teachgammon/tutor.c:1.9
--- src/games/backgammon/teachgammon/tutor.c:1.8 Wed Aug 12 05:17:57 2009
+++ src/games/backgammon/teachgammon/tutor.c Mon Mar 22 05:10:19 2010
@@ -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 @@
}
if (tflag)
curmove(18, 0);
- text(*test[i].com);
+ wrtext(*test[i].com);
if (!tflag)
writec('\n');
if (i == maxmoves)
