Module Name: src
Committed By: rillig
Date: Fri Sep 3 21:02:04 UTC 2021
Modified Files:
src/usr.sbin/inetd: inetd.c ipsec.c
Log Message:
inetd: remove redundant tests before calling isspace
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/usr.sbin/inetd/inetd.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/inetd/ipsec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/inetd/inetd.c
diff -u src/usr.sbin/inetd/inetd.c:1.135 src/usr.sbin/inetd/inetd.c:1.136
--- src/usr.sbin/inetd/inetd.c:1.135 Fri Sep 3 20:41:19 2021
+++ src/usr.sbin/inetd/inetd.c Fri Sep 3 21:02:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: inetd.c,v 1.135 2021/09/03 20:41:19 rillig Exp $ */
+/* $NetBSD: inetd.c,v 1.136 2021/09/03 21:02:04 rillig Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)inetd.c 8.4 (Berkeley) 4/13/94";
#else
-__RCSID("$NetBSD: inetd.c,v 1.135 2021/09/03 20:41:19 rillig Exp $");
+__RCSID("$NetBSD: inetd.c,v 1.136 2021/09/03 21:02:04 rillig Exp $");
#endif
#endif /* not lint */
@@ -1234,7 +1234,7 @@ more:
/* lines starting with #@ is not a comment, but the policy */
if (cp[1] == '@') {
char *p;
- for (p = cp + 2; p && *p && isspace((unsigned char)*p); p++)
+ for (p = cp + 2; isspace((unsigned char)*p); p++)
;
if (*p == '\0') {
if (policy)
Index: src/usr.sbin/inetd/ipsec.c
diff -u src/usr.sbin/inetd/ipsec.c:1.7 src/usr.sbin/inetd/ipsec.c:1.8
--- src/usr.sbin/inetd/ipsec.c:1.7 Fri Sep 3 20:24:28 2021
+++ src/usr.sbin/inetd/ipsec.c Fri Sep 3 21:02:04 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.c,v 1.7 2021/09/03 20:24:28 rillig Exp $ */
+/* $NetBSD: ipsec.c,v 1.8 2021/09/03 21:02:04 rillig Exp $ */
/*
* Copyright (C) 1999 WIDE Project.
@@ -69,7 +69,7 @@ ipsecsetup(int af, int fd, const char *p
p = strtok(p, ";");
if (p == NULL)
break;
- while (*p && isspace((unsigned char)*p))
+ while (isspace((unsigned char)*p))
p++;
if (*p == '\0') {
p = NULL;
@@ -103,7 +103,7 @@ ipsecsetup_test(const char *policy)
p = strtok(p, ";");
if (p == NULL)
break;
- while (*p && isspace((unsigned char)*p))
+ while (isspace((unsigned char)*p))
p++;
if (*p == '\0') {
p = NULL;
