Module Name: src
Committed By: christos
Date: Mon Dec 30 01:34:23 UTC 2013
Modified Files:
src/external/bsd/ntp/dist/ntpd: ntp_config.c
src/external/bsd/ntp/dist/ntpq: ntpq-subs.c
src/external/bsd/ntp/dist/sntp: main.c
Log Message:
remove unused variables
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/ntpd/ntp_config.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/ntpq/ntpq-subs.c
cvs rdiff -u -r1.9 -r1.10 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/ntpd/ntp_config.c
diff -u src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.6 src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.7
--- src/external/bsd/ntp/dist/ntpd/ntp_config.c:1.6 Fri Dec 27 22:20:14 2013
+++ src/external/bsd/ntp/dist/ntpd/ntp_config.c Sun Dec 29 20:34:22 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ntp_config.c,v 1.6 2013/12/28 03:20:14 christos Exp $ */
+/* $NetBSD: ntp_config.c,v 1.7 2013/12/30 01:34:22 christos Exp $ */
/* ntp_config.c
*
@@ -2595,9 +2595,7 @@ config_rlimit(
)
{
attr_val * rlimit_av;
- int item;
- item = -1; /* quiet warning */
rlimit_av = HEAD_PFIFO(ptree->rlimit);
for (; rlimit_av != NULL; rlimit_av = rlimit_av->link) {
switch (rlimit_av->attr) {
Index: src/external/bsd/ntp/dist/ntpq/ntpq-subs.c
diff -u src/external/bsd/ntp/dist/ntpq/ntpq-subs.c:1.5 src/external/bsd/ntp/dist/ntpq/ntpq-subs.c:1.6
--- src/external/bsd/ntp/dist/ntpq/ntpq-subs.c:1.5 Fri Dec 27 22:20:14 2013
+++ src/external/bsd/ntp/dist/ntpq/ntpq-subs.c Sun Dec 29 20:34:22 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ntpq-subs.c,v 1.5 2013/12/28 03:20:14 christos Exp $ */
+/* $NetBSD: ntpq-subs.c,v 1.6 2013/12/30 01:34:22 christos Exp $ */
/*
* ntpq-subs.c - subroutines which are called to perform ntpq commands.
@@ -3174,7 +3174,6 @@ ifstats(
char * tag;
char * val;
int fields;
- u_int ifnum;
u_int ui;
ifstats_row row;
int comprende;
@@ -3193,7 +3192,6 @@ ifstats(
ZERO(row);
fields = 0;
- ifnum = 0;
ui = 0;
while (nextvar(&dsize, &datap, &tag, &val)) {
if (debug > 1)
@@ -3391,7 +3389,6 @@ reslist(
char * tag;
char * val;
int fields;
- u_int idx;
u_int ui;
reslist_row row;
int comprende;
@@ -3410,7 +3407,6 @@ reslist(
ZERO(row);
fields = 0;
- idx = 0;
ui = 0;
while (nextvar(&dsize, &datap, &tag, &val)) {
if (debug > 1)
Index: src/external/bsd/ntp/dist/sntp/main.c
diff -u src/external/bsd/ntp/dist/sntp/main.c:1.9 src/external/bsd/ntp/dist/sntp/main.c:1.10
--- src/external/bsd/ntp/dist/sntp/main.c:1.9 Sat Dec 28 22:26:07 2013
+++ src/external/bsd/ntp/dist/sntp/main.c Sun Dec 29 20:34:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.9 2013/12/29 03:26:07 christos Exp $ */
+/* $NetBSD: main.c,v 1.10 2013/12/30 01:34:23 christos Exp $ */
#include <config.h>
@@ -297,9 +297,7 @@ open_sockets(
)
{
sockaddr_u name;
- int one_fam_works;
- one_fam_works = FALSE;
if (-1 == sock4) {
sock4 = socket(PF_INET, SOCK_DGRAM, 0);
if (-1 == sock4) {
@@ -330,7 +328,6 @@ open_sockets(
msyslog(LOG_ERR,
"open_sockets: event_new(base, sock4) failed!");
} else {
- one_fam_works = TRUE;
event_add(ev_sock4, &wakeup_tv);
}
}
@@ -365,7 +362,6 @@ open_sockets(
msyslog(LOG_ERR,
"open_sockets: event_new(base, sock6) failed!");
} else {
- one_fam_works = TRUE;
event_add(ev_sock6, &wakeup_tv);
}
}
