diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-06-30 16:52:28 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-06-30 16:52:28 +0000 |
| commit | 36027fc20684b9f8853753b6b684e75f30f731a9 (patch) | |
| tree | 13f18ca7aed513ab5cba7543c62869e16e72fdde /usr.sbin/ntpd | |
| parent | 27f5afc026dac6b00cbd852f5edeef899a427795 (diff) | |
spaces
Diffstat (limited to 'usr.sbin/ntpd')
| -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 |
4 files changed, 11 insertions, 11 deletions
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 *); |