summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cribbage/io.c26
-rw-r--r--cribbage/score.c12
-rw-r--r--larn/io.c12
-rw-r--r--rogue/inventory.c8
4 files changed, 29 insertions, 29 deletions
diff --git a/cribbage/io.c b/cribbage/io.c
index bdc2d35c..a1ebe3dc 100644
--- a/cribbage/io.c
+++ b/cribbage/io.c
@@ -1,4 +1,4 @@
-/* $NetBSD: io.c,v 1.7 1995/03/21 15:08:53 cgd Exp $ */
+/* $NetBSD: io.c,v 1.8 1997/05/17 19:26:18 pk Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)io.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$NetBSD: io.c,v 1.7 1995/03/21 15:08:53 cgd Exp $";
+static char rcsid[] = "$NetBSD: io.c,v 1.8 1997/05/17 19:26:18 pk Exp $";
#endif
#endif /* not lint */
@@ -256,10 +256,10 @@ incard(crd)
if (!(line = getline()))
goto gotit;
p = p1 = line;
- while (*p1 != ' ' && *p1 != NULL)
+ while (*p1 != ' ' && *p1 != '\0')
++p1;
- *p1++ = NULL;
- if (*p == NULL)
+ *p1++ = '\0';
+ if (*p == '\0')
goto gotit;
/* IMPORTANT: no real card has 2 char first name */
@@ -295,17 +295,17 @@ incard(crd)
if (rnk == EMPTY)
goto gotit;
p = p1;
- while (*p1 != ' ' && *p1 != NULL)
+ while (*p1 != ' ' && *p1 != '\0')
++p1;
- *p1++ = NULL;
- if (*p == NULL)
+ *p1++ = '\0';
+ if (*p == '\0')
goto gotit;
if (!strcmp("OF", p)) {
p = p1;
- while (*p1 != ' ' && *p1 != NULL)
+ while (*p1 != ' ' && *p1 != '\0')
++p1;
- *p1++ = NULL;
- if (*p == NULL)
+ *p1++ = '\0';
+ if (*p == '\0')
goto gotit;
}
sut = EMPTY;
@@ -354,7 +354,7 @@ number(lo, hi, prompt)
for (sum = 0;;) {
msg(prompt);
- if (!(p = getline()) || *p == NULL) {
+ if (!(p = getline()) || *p == '\0') {
msg(quiet ? "Not a number" :
"That doesn't look like a number");
continue;
@@ -369,7 +369,7 @@ number(lo, hi, prompt)
++p;
}
- if (*p != ' ' && *p != '\t' && *p != NULL)
+ if (*p != ' ' && *p != '\t' && *p != '\0')
sum = lo - 1;
if (sum >= lo && sum <= hi)
break;
diff --git a/cribbage/score.c b/cribbage/score.c
index 93f8c075..ac8c210d 100644
--- a/cribbage/score.c
+++ b/cribbage/score.c
@@ -1,4 +1,4 @@
-/* $NetBSD: score.c,v 1.3 1995/03/21 15:08:57 cgd Exp $ */
+/* $NetBSD: score.c,v 1.4 1997/05/17 19:26:19 pk Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)score.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$NetBSD: score.c,v 1.3 1995/03/21 15:08:57 cgd Exp $";
+static char rcsid[] = "$NetBSD: score.c,v 1.4 1997/05/17 19:26:19 pk Exp $";
#endif
#endif /* not lint */
@@ -121,7 +121,7 @@ scorehand(hand, starter, n, crb, do_explain)
CARD h[(CINHAND + 1)];
char buf[32];
- expl[0] = NULL; /* initialize explanation */
+ expl[0] = '\0'; /* initialize explanation */
score = 0;
flag = TRUE;
k = hand[0].suit;
@@ -137,7 +137,7 @@ scorehand(hand, starter, n, crb, do_explain)
}
if (flag && n >= CINHAND) {
- if (do_explain && expl[0] != NULL)
+ if (do_explain && expl[0] != '\0')
strcat(expl, ", ");
if (starter.suit == k) {
score += 5;
@@ -146,13 +146,13 @@ scorehand(hand, starter, n, crb, do_explain)
} else
if (!crb) {
score += 4;
- if (do_explain && expl[0] != NULL)
+ if (do_explain && expl[0] != '\0')
strcat(expl, ", Four-flush");
else
strcpy(expl, "Four-flush");
}
}
- if (do_explain && expl[0] != NULL)
+ if (do_explain && expl[0] != '\0')
strcat(expl, ", ");
h[n] = starter;
sorthand(h, n + 1); /* sort by rank */
diff --git a/larn/io.c b/larn/io.c
index 6f05fec0..fa02f863 100644
--- a/larn/io.c
+++ b/larn/io.c
@@ -1,5 +1,5 @@
#ifndef lint
-static char rcsid[] = "$NetBSD: io.c,v 1.5 1996/08/15 03:53:24 mrg Exp $";
+static char rcsid[] = "$NetBSD: io.c,v 1.6 1997/05/17 19:26:22 pk Exp $";
#endif /* not lint */
/* io.c Larn is copyrighted 1986 by Noah Morgan.
@@ -416,11 +416,11 @@ char *lgetw()
register char *lgp,cc;
register int n=LINBUFSIZE,quote=0;
lgp = lgetwbuf;
- do cc=lgetc(); while ((cc <= 32) && (cc > NULL)); /* eat whitespace */
+ do cc=lgetc(); while ((cc <= 32) && (cc > '\0')); /* eat whitespace */
for ( ; ; --n,cc=lgetc())
{
- if ((cc==NULL) && (lgp==lgetwbuf)) return(NULL); /* EOF */
- if ((n<=1) || ((cc<=32) && (quote==0))) { *lgp=NULL; return(lgetwbuf); }
+ if ((cc=='\0') && (lgp==lgetwbuf)) return(NULL); /* EOF */
+ if ((n<=1) || ((cc<=32) && (quote==0))) { *lgp='\0'; return(lgetwbuf); }
if (cc != '"') *lgp++ = cc; else quote ^= 1;
}
}
@@ -436,10 +436,10 @@ char *lgetl()
register char *str=lgetwbuf;
for ( ; ; --i)
{
- if ((*str++ = ch = lgetc()) == NULL)
+ if ((*str++ = ch = lgetc()) == '\0')
{
if (str == lgetwbuf+1) return(NULL); /* EOF */
- ot: *str = NULL; return(lgetwbuf); /* line ended by EOF */
+ ot: *str = '\0'; return(lgetwbuf); /* line ended by EOF */
}
if ((ch=='\n') || (i<=1)) goto ot; /* line ended by \n */
}
diff --git a/rogue/inventory.c b/rogue/inventory.c
index c36f9235..0a42e12f 100644
--- a/rogue/inventory.c
+++ b/rogue/inventory.c
@@ -1,4 +1,4 @@
-/* $NetBSD: inventory.c,v 1.3 1995/04/22 10:27:35 cgd Exp $ */
+/* $NetBSD: inventory.c,v 1.4 1997/05/17 19:26:24 pk Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -40,7 +40,7 @@
#if 0
static char sccsid[] = "@(#)inventory.c 8.1 (Berkeley) 5/31/93";
#else
-static char rcsid[] = "$NetBSD: inventory.c,v 1.3 1995/04/22 10:27:35 cgd Exp $";
+static char rcsid[] = "$NetBSD: inventory.c,v 1.4 1997/05/17 19:26:24 pk Exp $";
#endif
#endif /* not lint */
@@ -182,9 +182,9 @@ struct id_com_s com_id_tab[COMS] = {
'b', "b down & left",
'c', "c call object",
'n', "n down & right",
- NULL, "<SHIFT><dir>: run that way",
+ '\0', "<SHIFT><dir>: run that way",
')', ") print current weapon",
- NULL, "<CTRL><dir>: run till adjacent",
+ '\0', "<CTRL><dir>: run till adjacent",
']', "] print current armor",
'f', "f<dir> fight till death or near death",
'=', "= print current rings",
generated by cgit v1.2.3-56-ge451 (git 2.39.0) at 2024-05-19 23:07:13 +0000