diff options
| author |   pk <pk@NetBSD.org> | 1997-05-17 19:24:44 +0000 |
|---|---|---|
| committer | pk <pk@NetBSD.org> | 1997-05-17 19:24:44 +0000 |
| commit | b218620de93fbebcfba8ec74b22d33986ba70b3f (patch) | |
| tree | babfc29746c0627a1f08d231c120eac9691c18db /cribbage | |
| parent | 531a2505768cab68a9b91fb45959ed2be5a2fc33 (diff) | |
| download | bsdgames-darwin-b218620de93fbebcfba8ec74b22d33986ba70b3f.tar.gz bsdgames-darwin-b218620de93fbebcfba8ec74b22d33986ba70b3f.tar.zst bsdgames-darwin-b218620de93fbebcfba8ec74b22d33986ba70b3f.zip | |
NULL => 0 (Arne Juul; PR#3629)
Diffstat (limited to 'cribbage')
| -rw-r--r-- | cribbage/io.c | 26 | ||||
| -rw-r--r-- | cribbage/score.c | 12 |
2 files changed, 19 insertions, 19 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 */ |