diff options
author | Henning Brauer <henning@cvs.openbsd.org> | 2005-04-13 18:25:29 +0000 |
---|---|---|
committer | Henning Brauer <henning@cvs.openbsd.org> | 2005-04-13 18:25:29 +0000 |
commit | e8313c062e552ad61ef957096a489456cfa1395e (patch) | |
tree | 8490116250889330892a56d9342cd98e0b803be9 /usr.sbin/hostapd | |
parent | fbd9185cd25b95eabb882ad60bd5546ac6bfc50d (diff) |
KNF
Diffstat (limited to 'usr.sbin/hostapd')
-rw-r--r-- | usr.sbin/hostapd/apme.c | 6 | ||||
-rw-r--r-- | usr.sbin/hostapd/hostapd.c | 15 | ||||
-rw-r--r-- | usr.sbin/hostapd/iapp.c | 4 | ||||
-rw-r--r-- | usr.sbin/hostapd/privsep.c | 6 |
4 files changed, 15 insertions, 16 deletions
diff --git a/usr.sbin/hostapd/apme.c b/usr.sbin/hostapd/apme.c index e131924b471..b36da8fd5ed 100644 --- a/usr.sbin/hostapd/apme.c +++ b/usr.sbin/hostapd/apme.c @@ -1,4 +1,4 @@ -/* $OpenBSD: apme.c,v 1.1 2005/04/13 18:12:23 reyk Exp $ */ +/* $OpenBSD: apme.c,v 1.2 2005/04/13 18:25:28 henning Exp $ */ /* * Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net> @@ -142,8 +142,8 @@ hostapd_apme_init(struct hostapd_config *cfg) i = 1; if (ioctl(cfg->c_apme_raw, BIOCIMMEDIATE, &i) == -1) - hostapd_fatal("failed to set BPF immediate mode on \"%s\": %s\n", - cfg->c_apme_iface, strerror(errno)); + hostapd_fatal("failed to set BPF immediate mode on \"%s\": " + "%s\n", cfg->c_apme_iface, strerror(errno)); bzero(&ifr, sizeof(struct ifreq)); strlcpy(ifr.ifr_name, cfg->c_apme_iface, sizeof(ifr.ifr_name)); diff --git a/usr.sbin/hostapd/hostapd.c b/usr.sbin/hostapd/hostapd.c index 05b2d8f71ae..7364cc9bafe 100644 --- a/usr.sbin/hostapd/hostapd.c +++ b/usr.sbin/hostapd/hostapd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hostapd.c,v 1.1 2005/04/13 18:12:23 reyk Exp $ */ +/* $OpenBSD: hostapd.c,v 1.2 2005/04/13 18:25:28 henning Exp $ */ /* * Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net> @@ -255,9 +255,8 @@ hostapd_udp_init(struct hostapd_config *cfg) if (setsockopt(cfg->c_iapp_udp, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)) == -1) - hostapd_fatal("failed to add multicast membership to %s:" - " %s\n", - IAPP_MCASTADDR, strerror(errno)); + hostapd_fatal("failed to add multicast membership to " + "%s: %s\n", IAPP_MCASTADDR, strerror(errno)); } } @@ -265,7 +264,7 @@ void hostapd_sig_handler(int sig) { switch (sig) { - case SIGALRM: + case SIGALRM: case SIGTERM: case SIGQUIT: case SIGINT: @@ -342,8 +341,8 @@ main(int argc, char *argv[]) break; case 'D': if (hostapd_parse_symset(optarg) < 0) - hostapd_fatal("could not parse macro definition %s", - optarg); + hostapd_fatal("could not parse macro " + "definition %s", optarg); break; case 'd': cfg->c_debug++; @@ -449,5 +448,5 @@ main(int argc, char *argv[]) /* Executed after the event loop has been terminated */ hostapd_cleanup(cfg); - return(EXIT_SUCCESS); + return (EXIT_SUCCESS); } diff --git a/usr.sbin/hostapd/iapp.c b/usr.sbin/hostapd/iapp.c index 60c64c1b438..f902fdc3498 100644 --- a/usr.sbin/hostapd/iapp.c +++ b/usr.sbin/hostapd/iapp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: iapp.c,v 1.1 2005/04/13 18:12:23 reyk Exp $ */ +/* $OpenBSD: iapp.c,v 1.2 2005/04/13 18:25:28 henning Exp $ */ /* * Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net> @@ -45,7 +45,7 @@ hostapd_iapp_init(struct hostapd_config *cfg) { if ((cfg->c_flags & HOSTAPD_CFG_F_APME) == 0) return; - + /* Get Host AP's BSSID */ hostapd_priv_apme_bssid(cfg); diff --git a/usr.sbin/hostapd/privsep.c b/usr.sbin/hostapd/privsep.c index 5a395b82991..dd8eec9e81c 100644 --- a/usr.sbin/hostapd/privsep.c +++ b/usr.sbin/hostapd/privsep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: privsep.c,v 1.1 2005/04/13 18:12:23 reyk Exp $ */ +/* $OpenBSD: privsep.c,v 1.2 2005/04/13 18:25:28 henning Exp $ */ /* * Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net> @@ -131,7 +131,6 @@ hostapd_priv_init(struct hostapd_config *cfg) return; } - /* * Privileged mother process */ @@ -237,7 +236,8 @@ hostapd_priv(int fd, short sig, void *arg) node.ni_rssi = sta.sig_info; node.ni_capinfo = sta.capinfo; - hostapd_must_write(fd, &node, sizeof(struct hostapd_node)); + hostapd_must_write(fd, &node, + sizeof(struct hostapd_node)); } break; |