diff options
| -rw-r--r-- | sbin/pfctl/pfctl.c | 4 | ||||
| -rw-r--r-- | sbin/pfctl/pfctl_parser.c | 6 | ||||
| -rw-r--r-- | usr.sbin/ntpd/ntp.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ntpd/ntpd.c | 8 | ||||
| -rw-r--r-- | usr.sbin/ntpd/ntpd.h | 4 | ||||
| -rw-r--r-- | usr.sbin/ntpd/sensors.c | 6 |
6 files changed, 16 insertions, 16 deletions
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index d3665a787c4..002e6ce4e3d 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl.c,v 1.246 2006/05/28 02:45:45 mcbride Exp $ */ +/* $OpenBSD: pfctl.c,v 1.247 2006/06/30 16:52:27 deraadt Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1002,7 +1002,7 @@ pfctl_add_rule(struct pfctl *pf, struct pf_rule *r, const char *anchor_call) while ((pa = TAILQ_FIRST(&r->rpool.list)) != NULL) { TAILQ_REMOVE(&r->rpool.list, pa, entries); TAILQ_INSERT_TAIL(&pfr->por_rule.rpool.list, pa, - entries); + entries); } } else { memset(&pfr->por_rule.rpool, 0, diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c index 5bf93e67c2c..40449787f90 100644 --- a/sbin/pfctl/pfctl_parser.c +++ b/sbin/pfctl/pfctl_parser.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl_parser.c,v 1.224 2006/05/23 12:04:28 henning Exp $ */ +/* $OpenBSD: pfctl_parser.c,v 1.225 2006/06/30 16:52:27 deraadt Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -485,7 +485,7 @@ print_status(struct pf_status *s, int opts) time_t runtime; int i; char buf[PF_MD5_DIGEST_LENGTH * 2 + 1]; - static const char hex[] = "0123456789abcdef"; + static const char hex[] = "0123456789abcdef"; runtime = time(NULL) - s->since; running = s->running ? "Enabled" : "Disabled"; @@ -1236,7 +1236,7 @@ ifa_grouplookup(const char *ifa_name, int flags) n->tail = hn; } } - free(ifgr.ifgr_groups); + free(ifgr.ifgr_groups); close(s); return (h); diff --git a/usr.sbin/ntpd/ntp.c b/usr.sbin/ntpd/ntp.c index c38ef284ecc..d9dfbcf99ec 100644 --- a/usr.sbin/ntpd/ntp.c +++ b/usr.sbin/ntpd/ntp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntp.c,v 1.89 2006/06/26 09:43:06 otto Exp $ */ +/* $OpenBSD: ntp.c,v 1.90 2006/06/30 16:52:13 deraadt Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -452,7 +452,7 @@ priv_adjfreq(double offset) return; conf->freq.overall_offset += offset; - offset = conf->freq.overall_offset; + offset = conf->freq.overall_offset; curtime = gettime_corrected(); conf->freq.xy += offset * curtime; diff --git a/usr.sbin/ntpd/ntpd.c b/usr.sbin/ntpd/ntpd.c index ed7317a6a98..37bd314dc90 100644 --- a/usr.sbin/ntpd/ntpd.c +++ b/usr.sbin/ntpd/ntpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ntpd.c,v 1.47 2006/06/30 06:39:00 otto Exp $ */ +/* $OpenBSD: ntpd.c,v 1.48 2006/06/30 16:52:13 deraadt Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -224,7 +224,7 @@ int check_child(pid_t pid, const char *pname) { int status, sig; - char *signame; + char *signame; if (waitpid(pid, &status, WNOHANG) > 0) { if (WIFEXITED(status)) { @@ -362,7 +362,7 @@ void ntpd_adjfreq(double relfreq, int wrlog) { int64_t curfreq; - + if (adjfreq(NULL, &curfreq) == -1) { log_warn("adjfreq failed"); return; @@ -377,7 +377,7 @@ ntpd_adjfreq(double relfreq, int wrlog) log_info("adjusting clock frequency by %f to %fppm", relfreq * 1e6, curfreq / 1e3 / (1LL << 32)); - if (adjfreq(&curfreq, NULL) == -1) + if (adjfreq(&curfreq, NULL) == -1) log_warn("adjfreq failed"); writefreq(curfreq / 1e9 / (1LL << 32)); } diff --git a/usr.sbin/ntpd/ntpd.h b/usr.sbin/ntpd/ntpd.h index 3380ea6263f..2349203e483 100644 --- a/usr.sbin/ntpd/ntpd.h +++ b/usr.sbin/ntpd/ntpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ntpd.h,v 1.75 2006/06/26 09:43:06 otto Exp $ */ +/* $OpenBSD: ntpd.h,v 1.76 2006/06/30 16:52:13 deraadt Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -159,7 +159,7 @@ struct ntpd_conf { TAILQ_HEAD(listen_addrs, listen_addr) listen_addrs; TAILQ_HEAD(ntp_peers, ntp_peer) ntp_peers; TAILQ_HEAD(ntp_sensors, ntp_sensor) ntp_sensors; - TAILQ_HEAD(ntp_conf_sensors, ntp_conf_sensor) ntp_conf_sensors; + TAILQ_HEAD(ntp_conf_sensors, ntp_conf_sensor) ntp_conf_sensors; struct ntp_status status; struct ntp_freq freq; u_int8_t listen_all; diff --git a/usr.sbin/ntpd/sensors.c b/usr.sbin/ntpd/sensors.c index 6e5463a1a86..a43097e6b20 100644 --- a/usr.sbin/ntpd/sensors.c +++ b/usr.sbin/ntpd/sensors.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sensors.c,v 1.19 2006/06/02 21:17:01 henning Exp $ */ +/* $OpenBSD: sensors.c,v 1.20 2006/06/30 16:52:13 deraadt Exp $ */ /* * Copyright (c) 2006 Henning Brauer <henning@openbsd.org> @@ -31,8 +31,8 @@ #include "ntpd.h" -#define SENSORS_MAX 255 -#define _PATH_DEV_HOTPLUG "/dev/hotplug" +#define SENSORS_MAX 255 +#define _PATH_DEV_HOTPLUG "/dev/hotplug" void sensor_probe(int); void sensor_add(struct sensor *); |