summaryrefslogtreecommitdiff
path: root/sbin/dhclient
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2020-05-26 23:42:12 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2020-05-26 23:42:12 +0000
commite66694cb95cf8c5d8c4cca3dead03a40e5c72ec1 (patch)
treef2ca6b2a3f5f4128957d33aec6f1b197345c2b5d /sbin/dhclient
parentb42f25da7c53bfb8302b1db8defc37ad76e34e05 (diff)
Wrap some overly long lines.
Diffstat (limited to 'sbin/dhclient')
-rw-r--r--sbin/dhclient/dhclient.c10
-rw-r--r--sbin/dhclient/kroute.c8
-rw-r--r--sbin/dhclient/privsep.h5
3 files changed, 15 insertions, 8 deletions
diff --git a/sbin/dhclient/dhclient.c b/sbin/dhclient/dhclient.c
index 91be80d18e4..095fb399bda 100644
--- a/sbin/dhclient/dhclient.c
+++ b/sbin/dhclient/dhclient.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhclient.c,v 1.674 2020/05/26 23:28:40 krw Exp $ */
+/* $OpenBSD: dhclient.c,v 1.675 2020/05/26 23:42:11 krw Exp $ */
/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -2233,12 +2233,16 @@ res_hnok_list(const char *names)
}
/*
- * Decode a byte string encoding a list of domain names as specified in RFC 1035
+ * Decode a byte string encoding a list of domain names as specified in RFC1035
* section 4.1.4.
*
* The result is a string consisting of a blank separated list of domain names.
*
- e.g. 3:65:6e:67:5:61:70:70:6c:65:3:63:6f:6d:0:9:6d:61:72:6b:65:74:69:6e:67:c0:04
+ * e.g.
+ *
+ * 3:65:6e:67:5:61:70:70:6c:65:3:63:6f:6d:0:9:6d:61:72:6b:65:74:69:6e:67:c0:04
+ *
+ * which represents
*
* 3 |'e'|'n'|'g'| 5 |'a'|'p'|'p'|'l'|
* 'e'| 3 |'c'|'o'|'m'| 0 | 9 |'m'|'a'|
diff --git a/sbin/dhclient/kroute.c b/sbin/dhclient/kroute.c
index fc0c2ed090b..c52680ade56 100644
--- a/sbin/dhclient/kroute.c
+++ b/sbin/dhclient/kroute.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kroute.c,v 1.183 2020/05/21 12:31:02 krw Exp $ */
+/* $OpenBSD: kroute.c,v 1.184 2020/05/26 23:42:11 krw Exp $ */
/*
* Copyright 2012 Kenneth R Westerback <krw@openbsd.org>
@@ -900,7 +900,8 @@ priv_propose(char *name, int ioctlfd, struct proposal *proposal,
char *search = NULL;
int rslt;
- if (sz != proposal->routes_len + proposal->domains_len + proposal->ns_len) {
+ if (sz != proposal->routes_len + proposal->domains_len +
+ proposal->ns_len) {
log_warnx("%s: bad IMSG_PROPOSE data", log_procname);
return;
}
@@ -1008,7 +1009,8 @@ tell_unwind(struct unwind_info *unwind_info, int ifi_flags)
}
void
-priv_tell_unwind(int index, int routefd, int rdomain, struct unwind_info *unwind_info)
+priv_tell_unwind(int index, int routefd, int rdomain,
+ struct unwind_info *unwind_info)
{
struct rt_msghdr rtm;
struct sockaddr_rtdns rtdns;
diff --git a/sbin/dhclient/privsep.h b/sbin/dhclient/privsep.h
index de2d9a6448f..069a4fb6100 100644
--- a/sbin/dhclient/privsep.h
+++ b/sbin/dhclient/privsep.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: privsep.h,v 1.67 2020/05/20 23:54:53 krw Exp $ */
+/* $OpenBSD: privsep.h,v 1.68 2020/05/26 23:42:11 krw Exp $ */
/*
* Copyright (c) 2004 Henning Brauer <henning@openbsd.org>
@@ -41,7 +41,8 @@ struct unwind_info {
void dispatch_imsg(char *, int, int, int, struct imsgbuf *);
void priv_write_resolv_conf(int, int, int, char *, int *);
-void priv_propose(char *, int, struct proposal *, size_t, char **, int, int, int);
+void priv_propose(char *, int, struct proposal *, size_t, char **, int, int,
+ int);
void priv_revoke_proposal(char *, int, struct proposal *, char **);