diff options
| -rw-r--r-- | sbin/dhclient/clparse.c | 18 | ||||
| -rw-r--r-- | sbin/dhclient/conflex.c | 10 | ||||
| -rw-r--r-- | sbin/dhclient/kroute.c | 4 |
3 files changed, 16 insertions, 16 deletions
diff --git a/sbin/dhclient/clparse.c b/sbin/dhclient/clparse.c index 8e057b9c99b..4e6a3d369b2 100644 --- a/sbin/dhclient/clparse.c +++ b/sbin/dhclient/clparse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clparse.c,v 1.147 2017/10/23 13:01:20 krw Exp $ */ +/* $OpenBSD: clparse.c,v 1.148 2017/10/23 13:31:35 krw Exp $ */ /* Parser for dhclient config and lease files. */ @@ -163,12 +163,12 @@ read_client_conf(char *name) [config->requested_option_count++] = DHO_TFTP_SERVER; if ((cfile = fopen(path_dhclient_conf, "r")) != NULL) { - do { + for (;;) { token = peek_token(NULL, cfile); if (token == EOF) break; parse_client_statement(cfile, name, 0); - } while (1); + } fclose(cfile); } } @@ -192,7 +192,7 @@ read_client_leases(char *name, struct client_lease_tq *tq) new_parse(path_dhclient_db); - do { + for (;;) { token = next_token(NULL, cfile); if (token == EOF) break; @@ -202,7 +202,7 @@ read_client_leases(char *name, struct client_lease_tq *tq) } if (parse_client_lease_statement(cfile, name, &lp) == 1) add_lease(tq, lp); - } while (1); + } fclose(cfile); } @@ -487,7 +487,7 @@ parse_interface_declaration(FILE *cfile, char *name) return 0; } - do { + for (;;) { token = peek_token(&val, cfile); if (token == EOF) { parse_warn("unterminated interface declaration."); @@ -498,7 +498,7 @@ parse_interface_declaration(FILE *cfile, char *name) return 1; } parse_client_statement(cfile, name, 1); - } while (1); + } return 0; } @@ -531,7 +531,7 @@ parse_client_lease_statement(FILE *cfile, char *name, if (lease == NULL) fatal("lease"); - do { + for (;;) { token = peek_token(NULL, cfile); if (token == EOF) { parse_warn("unterminated lease declaration."); @@ -550,7 +550,7 @@ parse_client_lease_statement(FILE *cfile, char *name, return 1; } parse_client_lease_declaration(cfile, lease, name); - } while (1); + } return 0; } diff --git a/sbin/dhclient/conflex.c b/sbin/dhclient/conflex.c index 4453317b8c4..f70ad544290 100644 --- a/sbin/dhclient/conflex.c +++ b/sbin/dhclient/conflex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conflex.c,v 1.46 2017/10/20 15:03:16 krw Exp $ */ +/* $OpenBSD: conflex.c,v 1.47 2017/10/23 13:31:35 krw Exp $ */ /* Lexical scanner for dhclient config file. */ @@ -169,7 +169,7 @@ get_token(FILE *cfile) u = ugflag; - do { + for (;;) { l = line; p = lpos - u; u = 0; @@ -200,7 +200,7 @@ get_token(FILE *cfile) ttok = c; break; } - } while (1); + } return ttok; } @@ -255,7 +255,7 @@ skip_to_eol(FILE *cfile) { int c; - do { + for (;;) { c = get_char(cfile); if (c == EOF) return; @@ -263,7 +263,7 @@ skip_to_eol(FILE *cfile) eol(); return; } - } while (1); + } } static int diff --git a/sbin/dhclient/kroute.c b/sbin/dhclient/kroute.c index 769b5c2d69f..1af13cddc50 100644 --- a/sbin/dhclient/kroute.c +++ b/sbin/dhclient/kroute.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kroute.c,v 1.153 2017/09/20 19:21:00 krw Exp $ */ +/* $OpenBSD: kroute.c,v 1.154 2017/10/23 13:31:35 krw Exp $ */ /* * Copyright 2012 Kenneth R Westerback <krw@openbsd.org> @@ -75,7 +75,7 @@ get_routes(int rdomain, size_t *len) buf = NULL; errmsg = NULL; - while (1) { + for (;;) { if (sysctl(mib, 7, NULL, &needed, NULL, 0) == -1) { errmsg = "sysctl size of routes:"; break; |