summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>1997-10-07 14:46:48 +0000
committerlukem <lukem@NetBSD.org>1997-10-07 14:46:48 +0000
commit6ea62c3327dfb4bbe71decefcd23abb0d4a55d08 (patch)
tree7ad244133f4376f8ba194a9fa1365415a72ece89
parent0d2bc0fdb6b31ff73f5057c9f4c397819a1e7c73 (diff)
simplify test for skippable lines
-rw-r--r--usr.sbin/ypserv/mknetid/mknetid.c10
-rw-r--r--usr.sbin/ypserv/stdethers/stdethers.c8
2 files changed, 5 insertions, 13 deletions
diff --git a/usr.sbin/ypserv/mknetid/mknetid.c b/usr.sbin/ypserv/mknetid/mknetid.c
index 1891eddc297..4ca3df3d45d 100644
--- a/usr.sbin/ypserv/mknetid/mknetid.c
+++ b/usr.sbin/ypserv/mknetid/mknetid.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mknetid.c,v 1.2 1997/07/18 21:57:07 thorpej Exp $ */
+/* $NetBSD: mknetid.c,v 1.3 1997/10/07 14:46:48 lukem Exp $ */
/*
* Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -160,7 +160,7 @@ main(argc, argv)
if (domain == NULL)
if (yp_get_default_domain(&domain))
- errx(1, "can't get YP domain name");
+ errx(1, "Can't get YP domain name");
if ((pfile = fopen(PasswdFile, "r")) == NULL)
err(1, "%s", PasswdFile);
@@ -267,11 +267,7 @@ read_passwd(pfile, fname)
line_no++;
len = strlen(line);
- if (len > 1) {
- if (line[0] == '#') {
- continue;
- }
- } else
+ if (len <= 1 || data_line[0] == '#')
continue;
/*
diff --git a/usr.sbin/ypserv/stdethers/stdethers.c b/usr.sbin/ypserv/stdethers/stdethers.c
index 76d3a330601..c37d32c4a59 100644
--- a/usr.sbin/ypserv/stdethers/stdethers.c
+++ b/usr.sbin/ypserv/stdethers/stdethers.c
@@ -1,4 +1,4 @@
-/* $NetBSD: stdethers.c,v 1.3 1997/07/18 21:57:08 thorpej Exp $ */
+/* $NetBSD: stdethers.c,v 1.4 1997/10/07 14:56:10 lukem Exp $ */
/*
* Copyright (c) 1995 Mats O Jansson <moj@stacken.kth.se>
@@ -109,11 +109,7 @@ main(argc, argv)
line_no++;
len = strlen(data_line);
- if (len > 1) {
- if (data_line[0] == '#') {
- continue;
- }
- } else
+ if (len <= 1 || data_line[0] == '#')
continue;
/*