Fix some uses of NULL as non-pointer and 0 for null pointer.

This commit is contained in:
jsm 1999-09-17 17:07:11 +00:00
parent 786fb53653
commit ba40c8d63d
4 changed files with 13 additions and 12 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.14 1999/09/09 17:30:17 jsm Exp $ */ /* $NetBSD: main.c,v 1.15 1999/09/17 17:07:11 jsm Exp $ */
/* /*
* Copyright (c) 1980, 1993 * Copyright (c) 1980, 1993
@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
#if 0 #if 0
static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93"; static char sccsid[] = "@(#)main.c 8.1 (Berkeley) 5/31/93";
#else #else
__RCSID("$NetBSD: main.c,v 1.14 1999/09/09 17:30:17 jsm Exp $"); __RCSID("$NetBSD: main.c,v 1.15 1999/09/17 17:07:11 jsm Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -120,7 +120,7 @@ main(argc, argv)
/* use whole screen for text */ /* use whole screen for text */
if (tflag) if (tflag)
begscr = 0; begscr = 0;
t = time(0); t = time(NULL);
srandom(t); /* 'random' seed */ srandom(t); /* 'random' seed */
#ifdef V7 #ifdef V7

View File

@ -1,4 +1,4 @@
/* $NetBSD: bog.c,v 1.12 1999/09/08 21:17:44 jsm Exp $ */ /* $NetBSD: bog.c,v 1.13 1999/09/17 17:07:11 jsm Exp $ */
/*- /*-
* Copyright (c) 1993 * Copyright (c) 1993
@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\n\
#if 0 #if 0
static char sccsid[] = "@(#)bog.c 8.2 (Berkeley) 5/4/95"; static char sccsid[] = "@(#)bog.c 8.2 (Berkeley) 5/4/95";
#else #else
__RCSID("$NetBSD: bog.c,v 1.12 1999/09/08 21:17:44 jsm Exp $"); __RCSID("$NetBSD: bog.c,v 1.13 1999/09/17 17:07:11 jsm Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -604,7 +604,7 @@ checkdict()
} }
mword[nmwords++] = mwordsp; mword[nmwords++] = mwordsp;
p = w; p = w;
while ((*mwordsp++ = *p++) != NULL) while ((*mwordsp++ = *p++) != '\0')
; ;
} }
} }

View File

@ -1,4 +1,4 @@
/* $NetBSD: quiz.c,v 1.15 1999/09/12 09:02:22 jsm Exp $ */ /* $NetBSD: quiz.c,v 1.16 1999/09/17 17:07:11 jsm Exp $ */
/*- /*-
* Copyright (c) 1991, 1993 * Copyright (c) 1991, 1993
@ -47,7 +47,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
#if 0 #if 0
static char sccsid[] = "@(#)quiz.c 8.3 (Berkeley) 5/4/95"; static char sccsid[] = "@(#)quiz.c 8.3 (Berkeley) 5/4/95";
#else #else
__RCSID("$NetBSD: quiz.c,v 1.15 1999/09/12 09:02:22 jsm Exp $"); __RCSID("$NetBSD: quiz.c,v 1.16 1999/09/17 17:07:11 jsm Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -342,7 +342,7 @@ appdstr(s, tp, len)
if ((m = malloc(strlen(s) + len + 1)) == NULL) if ((m = malloc(strlen(s) + len + 1)) == NULL)
errx(1, "malloc"); errx(1, "malloc");
for (mp = m, sp = s; (*mp++ = *sp++) != NULL; ) for (mp = m, sp = s; (*mp++ = *sp++) != '\0'; )
; ;
--mp; --mp;
if (*(mp - 1) == '\\') if (*(mp - 1) == '\\')

View File

@ -1,4 +1,4 @@
/* $NetBSD: game.c,v 1.5 1997/10/13 19:44:09 christos Exp $ */ /* $NetBSD: game.c,v 1.6 1999/09/17 17:07:11 jsm Exp $ */
/* /*
* Copyright (c) 1983, 1993 * Copyright (c) 1983, 1993
@ -38,7 +38,7 @@
#if 0 #if 0
static char sccsid[] = "@(#)game.c 8.2 (Berkeley) 4/28/95"; static char sccsid[] = "@(#)game.c 8.2 (Berkeley) 4/28/95";
#else #else
__RCSID("$NetBSD: game.c,v 1.5 1997/10/13 19:44:09 christos Exp $"); __RCSID("$NetBSD: game.c,v 1.6 1999/09/17 17:07:11 jsm Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -52,7 +52,8 @@ char *af;
int turns; int turns;
turns = ship->specs->ta; turns = ship->specs->ta;
if ((*af = (ship->file->drift > 1 && turns)) != NULL) { *af = (ship->file->drift > 1 && turns);
if (*af != '\0') {
turns--; turns--;
if (ship->file->FS == 1) if (ship->file->FS == 1)
turns = 0; turns = 0;