Module Name: src
Committed By: christos
Date: Sun Oct 20 02:47:38 UTC 2013
Modified Files:
src/external/bsd/ntp/dist/libntp: icom.c
src/external/bsd/ntp/dist/ntpd: ntp_crypto.c ntp_proto.c
refclock_acts.c refclock_chu.c refclock_irig.c refclock_oncore.c
src/external/bsd/ntp/dist/sntp: main.c
Log Message:
fix unused variable warnings
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/libntp/icom.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/ntpd/ntp_crypto.c \
src/external/bsd/ntp/dist/ntpd/refclock_acts.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/ntpd/ntp_proto.c
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/ntp/dist/ntpd/refclock_chu.c \
src/external/bsd/ntp/dist/ntpd/refclock_irig.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/ntpd/refclock_oncore.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/sntp/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ntp/dist/libntp/icom.c
diff -u src/external/bsd/ntp/dist/libntp/icom.c:1.3 src/external/bsd/ntp/dist/libntp/icom.c:1.4
--- src/external/bsd/ntp/dist/libntp/icom.c:1.3 Wed Feb 1 02:46:22 2012
+++ src/external/bsd/ntp/dist/libntp/icom.c Sat Oct 19 22:47:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: icom.c,v 1.3 2012/02/01 07:46:22 kardel Exp $ */
+/* $NetBSD: icom.c,v 1.4 2013/10/20 02:47:38 christos Exp $ */
/*
* Program to control ICOM radios
@@ -129,11 +129,9 @@ icom_init(
{
TTY ttyb;
int fd;
- int flags;
int rc;
int saved_errno;
- flags = trace;
fd = tty_open(device, O_RDWR, 0777);
if (fd < 0)
return -1;
Index: src/external/bsd/ntp/dist/ntpd/ntp_crypto.c
diff -u src/external/bsd/ntp/dist/ntpd/ntp_crypto.c:1.4 src/external/bsd/ntp/dist/ntpd/ntp_crypto.c:1.5
--- src/external/bsd/ntp/dist/ntpd/ntp_crypto.c:1.4 Wed Feb 1 02:46:22 2012
+++ src/external/bsd/ntp/dist/ntpd/ntp_crypto.c Sat Oct 19 22:47:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_crypto.c,v 1.4 2012/02/01 07:46:22 kardel Exp $ */
+/* $NetBSD: ntp_crypto.c,v 1.5 2013/10/20 02:47:38 christos Exp $ */
/*
* ntp_crypto.c - NTP version 4 public key routines
@@ -393,7 +393,6 @@ crypto_recv(
int has_mac; /* length of MAC field */
int authlen; /* offset of MAC field */
associd_t associd; /* association ID */
- tstamp_t tstamp = 0; /* timestamp */
tstamp_t fstamp = 0; /* filestamp */
u_int len; /* extension field length */
u_int code; /* extension field opcode */
@@ -443,7 +442,6 @@ crypto_recv(
}
if (len >= VALUE_LEN) {
- tstamp = ntohl(ep->tstamp);
fstamp = ntohl(ep->fstamp);
vallen = ntohl(ep->vallen);
}
Index: src/external/bsd/ntp/dist/ntpd/refclock_acts.c
diff -u src/external/bsd/ntp/dist/ntpd/refclock_acts.c:1.4 src/external/bsd/ntp/dist/ntpd/refclock_acts.c:1.5
--- src/external/bsd/ntp/dist/ntpd/refclock_acts.c:1.4 Wed Feb 1 02:46:22 2012
+++ src/external/bsd/ntp/dist/ntpd/refclock_acts.c Sat Oct 19 22:47:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: refclock_acts.c,v 1.4 2012/02/01 07:46:22 kardel Exp $ */
+/* $NetBSD: refclock_acts.c,v 1.5 2013/10/20 02:47:38 christos Exp $ */
/*
* refclock_acts - clock driver for the NIST/USNO/PTB/NPL Computer Time
@@ -638,7 +638,6 @@ acts_poll (
struct peer *peer
)
{
- struct actsunit *up;
struct refclockproc *pp;
/*
@@ -647,7 +646,6 @@ acts_poll (
* the timeout routine and state machine.
*/
pp = peer->procptr;
- up = (struct actsunit *)pp->unitptr;
switch (peer->ttl) {
/*
Index: src/external/bsd/ntp/dist/ntpd/ntp_proto.c
diff -u src/external/bsd/ntp/dist/ntpd/ntp_proto.c:1.3 src/external/bsd/ntp/dist/ntpd/ntp_proto.c:1.4
--- src/external/bsd/ntp/dist/ntpd/ntp_proto.c:1.3 Wed Feb 1 02:46:22 2012
+++ src/external/bsd/ntp/dist/ntpd/ntp_proto.c Sat Oct 19 22:47:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_proto.c,v 1.3 2012/02/01 07:46:22 kardel Exp $ */
+/* $NetBSD: ntp_proto.c,v 1.4 2013/10/20 02:47:38 christos Exp $ */
/*
* ntp_proto.c - NTP version 4 protocol machinery
@@ -2220,7 +2220,7 @@ clock_select(void)
struct peer *peer;
int i, j, k, n;
int nlist, nl3;
- int allow, osurv;
+ int allow;
double d, e, f, g;
double high, low;
double seljitter;
@@ -2249,7 +2249,6 @@ clock_select(void)
* enough to handle all associations.
*/
osys_peer = sys_peer;
- osurv = sys_survivors;
sys_survivors = 0;
#ifdef LOCKCLOCK
sys_leap = LEAP_NOTINSYNC;
Index: src/external/bsd/ntp/dist/ntpd/refclock_chu.c
diff -u src/external/bsd/ntp/dist/ntpd/refclock_chu.c:1.1.1.2 src/external/bsd/ntp/dist/ntpd/refclock_chu.c:1.2
--- src/external/bsd/ntp/dist/ntpd/refclock_chu.c:1.1.1.2 Tue Jan 31 16:25:55 2012
+++ src/external/bsd/ntp/dist/ntpd/refclock_chu.c Sat Oct 19 22:47:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: refclock_chu.c,v 1.1.1.2 2012/01/31 21:25:55 kardel Exp $ */
+/* $NetBSD: refclock_chu.c,v 1.2 2013/10/20 02:47:38 christos Exp $ */
/*
* refclock_chu - clock driver for Canadian CHU time/frequency station
@@ -966,15 +966,11 @@ chu_serial_receive(
struct recvbuf *rbufp /* receive buffer structure pointer */
)
{
- struct chuunit *up;
- struct refclockproc *pp;
struct peer *peer;
u_char *dpt; /* receive buffer pointer */
peer = (struct peer *)rbufp->recv_srcclock;
- pp = peer->procptr;
- up = (struct chuunit *)pp->unitptr;
dpt = (u_char *)&rbufp->recv_space;
chu_decode(peer, *dpt, rbufp->recv_time);
Index: src/external/bsd/ntp/dist/ntpd/refclock_irig.c
diff -u src/external/bsd/ntp/dist/ntpd/refclock_irig.c:1.1.1.2 src/external/bsd/ntp/dist/ntpd/refclock_irig.c:1.2
--- src/external/bsd/ntp/dist/ntpd/refclock_irig.c:1.1.1.2 Tue Jan 31 16:24:51 2012
+++ src/external/bsd/ntp/dist/ntpd/refclock_irig.c Sat Oct 19 22:47:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: refclock_irig.c,v 1.1.1.2 2012/01/31 21:24:51 kardel Exp $ */
+/* $NetBSD: refclock_irig.c,v 1.2 2013/10/20 02:47:38 christos Exp $ */
/*
* refclock_irig - audio IRIG-B/E demodulator/decoder
@@ -983,10 +983,8 @@ irig_poll(
)
{
struct refclockproc *pp;
- struct irigunit *up;
pp = peer->procptr;
- up = (struct irigunit *)pp->unitptr;
if (pp->coderecv == pp->codeproc) {
refclock_report(peer, CEVNT_TIMEOUT);
Index: src/external/bsd/ntp/dist/ntpd/refclock_oncore.c
diff -u src/external/bsd/ntp/dist/ntpd/refclock_oncore.c:1.6 src/external/bsd/ntp/dist/ntpd/refclock_oncore.c:1.7
--- src/external/bsd/ntp/dist/ntpd/refclock_oncore.c:1.6 Wed Feb 1 02:46:22 2012
+++ src/external/bsd/ntp/dist/ntpd/refclock_oncore.c Sat Oct 19 22:47:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: refclock_oncore.c,v 1.6 2012/02/01 07:46:22 kardel Exp $ */
+/* $NetBSD: refclock_oncore.c,v 1.7 2013/10/20 02:47:38 christos Exp $ */
/*
* ----------------------------------------------------------------------------
@@ -2507,7 +2507,7 @@ oncore_msg_Bl(
size_t len
)
{
- int chan, id, subframe, valid, page, i, j, tow;
+ int subframe, valid, page, i, j, tow;
int day_now, day_lsf;
const char *cp = NULL /* XXX gcc */;
char Msg[120];
@@ -2521,8 +2521,6 @@ oncore_msg_Bl(
day_now = day_lsf = 0;
cp = NULL; /* keep gcc happy */
- chan = buf[4] & 0377;
- id = buf[5] & 0377;
subframe = buf[6] & 017;
valid = (buf[6] >> 4) & 017;
page = buf[7];
Index: src/external/bsd/ntp/dist/sntp/main.c
diff -u src/external/bsd/ntp/dist/sntp/main.c:1.6 src/external/bsd/ntp/dist/sntp/main.c:1.7
--- src/external/bsd/ntp/dist/sntp/main.c:1.6 Fri Feb 3 16:35:55 2012
+++ src/external/bsd/ntp/dist/sntp/main.c Sat Oct 19 22:47:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.6 2012/02/03 21:35:55 christos Exp $ */
+/* $NetBSD: main.c,v 1.7 2013/10/20 02:47:38 christos Exp $ */
#include <config.h>
@@ -365,7 +365,7 @@ on_wire (
int key_id = 0;
struct timeval tv_xmt;
struct pkt x_pkt;
- int error, rpktl, handle_pkt_res;
+ int rpktl, handle_pkt_res;
if (ENABLED_OPT(AUTHENTICATION)) {
@@ -375,7 +375,7 @@ on_wire (
for (try=0; try<5; try++) {
memset(&r_pkt, 0, sizeof rbuf);
- error = GETTIMEOFDAY(&tv_xmt, (struct timezone *)NULL);
+ (void)GETTIMEOFDAY(&tv_xmt, (struct timezone *)NULL);
tv_xmt.tv_sec += JAN_1970;
#ifdef DEBUG
