File bsd-games-2.17-gcc4.3.diff of Package bsd-games
Index: dab/gamescreen.h
===================================================================
--- dab/gamescreen.h.orig
+++ dab/gamescreen.h
@@ -70,9 +70,9 @@ class GAMESCREEN {
virtual void redraw(void) = 0; // Refresh
virtual int getinput(void) = 0; // Get user input
virtual void bell(void) = 0; // Beep
- virtual void score(size_t p, const PLAYER& p) = 0; // Post current score
- virtual void games(size_t p, const PLAYER& p) = 0; // Post games won
- virtual void total(size_t p, const PLAYER& p) = 0; // Post total score
+ virtual void score(size_t s, const PLAYER& p) = 0; // Post current score
+ virtual void games(size_t s, const PLAYER& p) = 0; // Post games won
+ virtual void total(size_t s, const PLAYER& p) = 0; // Post total score
virtual void ties(const PLAYER& p) = 0; // Post tie games
};
Index: dm/utmpentry.c
===================================================================
--- dm/utmpentry.c.orig
+++ dm/utmpentry.c
@@ -274,7 +274,7 @@ getentry(struct utmpentry *e, struct utm
(void)strncpy(e->line, up->ut_line, sizeof(up->ut_line));
e->line[sizeof(e->line) - 1] = '\0';
(void)strncpy(e->host, up->ut_host, sizeof(up->ut_host));
- e->name[sizeof(e->host) - 1] = '\0';
+ e->host[sizeof(e->host) - 1] = '\0';
e->tv.tv_sec = up->ut_time;
e->tv.tv_usec = 0;
adjust_size(e);
Index: boggle/boggle/bog.c
===================================================================
--- boggle/boggle/bog.c.orig
+++ boggle/boggle/bog.c
@@ -336,7 +336,7 @@ playgame()
}
while (1) {
- if (getline(buf) == NULL) {
+ if (bgetline(buf) == NULL) {
if (feof(stdin))
clearerr(stdin);
break;
Index: boggle/boggle/extern.h
===================================================================
--- boggle/boggle/extern.h.orig
+++ boggle/boggle/extern.h
@@ -43,7 +43,7 @@ void delay(int);
long dictseek(FILE *, long, int);
void findword(void);
void flushin(FILE *);
-char *getline(char *);
+char *bgetline(char *);
void getword(char *);
int help(void);
int inputch(void);
Index: boggle/boggle/mach.c
===================================================================
--- boggle/boggle/mach.c.orig
+++ boggle/boggle/mach.c
@@ -168,7 +168,7 @@ prwidth(base, indx)
* - doesn't accept words longer than MAXWORDLEN or containing caps
*/
char *
-getline(q)
+bgetline(q)
char *q;
{
int ch, done;
Index: cribbage/cribbage.h
===================================================================
--- cribbage/cribbage.h.orig
+++ cribbage/cribbage.h
@@ -77,7 +77,7 @@ int eq(CARD, CARD);
int fifteens(const CARD [], int);
void game(void);
void gamescore(void);
-char *getline(void);
+char *bgetline(void);
int getuchar(void);
int incard(CARD *);
int infrom(const CARD [], int, const char *);
Index: cribbage/crib.c
===================================================================
--- cribbage/crib.c.orig
+++ cribbage/crib.c
@@ -221,7 +221,7 @@ game()
if (!rflag) { /* player cuts deck */
msg(quiet ? "Cut for crib? " :
"Cut to see whose crib it is -- low card wins? ");
- getline();
+ bgetline();
}
i = (rand() >> 4) % CARDS; /* random cut */
do { /* comp cuts deck */
@@ -397,7 +397,7 @@ cut(mycrib, pos)
if (!rflag) { /* random cut */
msg(quiet ? "Cut the deck? " :
"How many cards down do you wish to cut the deck? ");
- getline();
+ bgetline();
}
i = (rand() >> 4) % (CARDS - pos);
turnover = deck[i + pos];
Index: cribbage/io.c
===================================================================
--- cribbage/io.c.orig
+++ cribbage/io.c
@@ -245,7 +245,7 @@ incard(crd)
retval = FALSE;
rnk = sut = EMPTY;
- if (!(line = getline()))
+ if (!(line = bgetline()))
goto gotit;
p = p1 = line;
while (*p1 != ' ' && *p1 != '\0')
@@ -346,7 +346,7 @@ number(lo, hi, prompt)
for (sum = 0;;) {
msg(prompt);
- if (!(p = getline()) || *p == '\0') {
+ if (!(p = bgetline()) || *p == '\0') {
msg(quiet ? "Not a number" :
"That doesn't look like a number");
continue;
@@ -528,12 +528,12 @@ over:
}
/*
- * getline:
+ * bgetline:
* Reads the next line up to '\n' or EOF. Multiple spaces are
* compressed to one space; a space is inserted before a ','
*/
char *
-getline()
+bgetline()
{
char *sp;
int c, oy, ox;
Index: gomoku/bdisp.c
===================================================================
--- gomoku/bdisp.c.orig
+++ gomoku/bdisp.c
@@ -241,7 +241,7 @@ ask(str)
}
int
-getline(buf, size)
+bgetline(buf, size)
char *buf;
int size;
{
Index: gomoku/gomoku.h
===================================================================
--- gomoku/gomoku.h.orig
+++ gomoku/gomoku.h
@@ -263,7 +263,7 @@ extern int debug;
void bdinit(struct spotstr *);
void init_overlap(void);
-int getline(char *, int);
+int bgetline(char *, int);
void ask(const char *);
void dislog(const char *);
void bdump(FILE *);
Index: gomoku/main.c
===================================================================
--- gomoku/main.c.orig
+++ gomoku/main.c
@@ -155,7 +155,7 @@ again:
if (inputfp == NULL && test == 0) {
for (;;) {
ask("black or white? ");
- getline(buf, sizeof(buf));
+ bgetline(buf, sizeof(buf));
if (buf[0] == 'b' || buf[0] == 'B') {
color = BLACK;
break;
@@ -172,7 +172,7 @@ again:
}
} else {
setbuf(stdout, 0);
- getline(buf, sizeof(buf));
+ bgetline(buf, sizeof(buf));
if (strcmp(buf, "black") == 0)
color = BLACK;
else if (strcmp(buf, "white") == 0)
@@ -244,7 +244,7 @@ again:
getinput:
if (interactive)
ask("move? ");
- if (!getline(buf, sizeof(buf))) {
+ if (!bgetline(buf, sizeof(buf))) {
curmove = RESIGN;
break;
}
@@ -256,7 +256,7 @@ again:
FILE *fp;
ask("save file name? ");
- (void)getline(buf, sizeof(buf));
+ (void)bgetline(buf, sizeof(buf));
if ((fp = fopen(buf, "w")) == NULL) {
glog("cannot create save file");
goto getinput;
@@ -309,14 +309,14 @@ again:
if (i != RESIGN) {
replay:
ask("replay? ");
- if (getline(buf, sizeof(buf)) &&
+ if (bgetline(buf, sizeof(buf)) &&
(buf[0] == 'y' || buf[0] == 'Y'))
goto again;
if (strcmp(buf, "save") == 0) {
FILE *fp;
ask("save file name? ");
- (void)getline(buf, sizeof(buf));
+ (void)bgetline(buf, sizeof(buf));
if ((fp = fopen(buf, "w")) == NULL) {
glog("cannot create save file");
goto replay;
@@ -367,7 +367,7 @@ whatsup(signum)
quit();
top:
ask("cmd? ");
- if (!getline(fmtbuf, sizeof(fmtbuf)))
+ if (!bgetline(fmtbuf, sizeof(fmtbuf)))
quit();
switch (*fmtbuf) {
case '\0':