summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnil Madhavapeddy <avsm@cvs.openbsd.org>2003-10-24 20:31:01 +0000
committerAnil Madhavapeddy <avsm@cvs.openbsd.org>2003-10-24 20:31:01 +0000
commitfda603321a4c0bb3ea49b921110a0a4a11927721 (patch)
tree63c814af15c1ff0302b8ab49f2e5102bfddf1db4
parent1e9a705cf6d4640d99a94b66fdcd9dea0444dbf2 (diff)
dont compare int to NULL, millert@ ok
-rw-r--r--lib/libc/gen/login_cap.c4
-rw-r--r--usr.sbin/inetd/inetd.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/libc/gen/login_cap.c b/lib/libc/gen/login_cap.c
index 31d7ba9f672..bc53fbf90e4 100644
--- a/lib/libc/gen/login_cap.c
+++ b/lib/libc/gen/login_cap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: login_cap.c,v 1.17 2003/06/25 21:16:47 deraadt Exp $ */
+/* $OpenBSD: login_cap.c,v 1.18 2003/10/24 20:31:00 avsm Exp $ */
/*-
* Copyright (c) 1995,1997 Berkeley Software Design, Inc. All rights reserved.
@@ -109,7 +109,7 @@ login_getclass(class)
case -1:
if ((res = open(classfiles[0], 0)) >= 0)
close(res);
- if (strcmp(lc->lc_class, LOGIN_DEFCLASS) == NULL &&
+ if (strcmp(lc->lc_class, LOGIN_DEFCLASS) == 0 &&
res < 0)
return (lc);
syslog(LOG_ERR, "%s: unknown class", lc->lc_class);
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 07a1d8c2f18..2eb8a1a31de 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inetd.c,v 1.112 2003/10/03 22:43:37 deraadt Exp $ */
+/* $OpenBSD: inetd.c,v 1.113 2003/10/24 20:30:02 avsm Exp $ */
/*
* Copyright (c) 1983,1991 The Regents of the University of California.
@@ -37,7 +37,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)inetd.c 5.30 (Berkeley) 6/3/91";*/
-static char rcsid[] = "$OpenBSD: inetd.c,v 1.112 2003/10/03 22:43:37 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: inetd.c,v 1.113 2003/10/24 20:30:02 avsm Exp $";
#endif /* not lint */
/*
@@ -348,7 +348,7 @@ main(int argc, char *argv[])
int val;
val = strtoul(optarg, &p, 0);
- if (val >= 1 && *p == NULL) {
+ if (val >= 1 && *p == '\0') {
toomany = val;
break;
}