ntpsnmpd, libntpq warning cleanup.

bk: 4cb6cfa2VPGM8ug6QELBb25_XI5E4g

diff --git a/ChangeLog b/ChangeLog
index 41c8f7127d4fd9534eefcb6b6767b5be394b1f31..e62ae134bb3bd2b93321526c4e6d84b9bb77f244 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+---
+
+* ntpsnmpd, libntpq warning cleanup.
+
 ---
 (4.2.6p3-RC3) 2010/10/14 Released by Harlan Stenn <stenn@ntp.org>
 
@@ -5,7 +9,7 @@
 * [Bug 1080] ntpd on ipv6 routers very chatty.
 * [Bug 1567] Support Arbiter 1093C Satellite Clock on Windows.
 * [Bug 1581] printf format string mismatch leftover.
-* [Bug 1584]: ntpsnmpd OID must be mib-2.197.
+* [Bug 1584] ntpsnmpd OID must be mib-2.197.
 * [Bug 1643] Range-check the decoding of the RIPE-NCC status codes.
 * [Bug 1644] cvo.sh should use lsb_release to identify linux distros.
 * [Bug 1659] Support Truetime Satellite Clocks on Windows.

diff --git a/ntpq/libntpq.c b/ntpq/libntpq.c
index e33f304ac22e96d876bad4e801879160cd31182e..c0a5c7c147b706eb2c03aa53a3afccda93e0516a 100644 (file)
--- a/ntpq/libntpq.c
+++ b/ntpq/libntpq.c
@@ -496,7 +496,7 @@ ntpq_read_sysvars(
        if (res != 0)
                return 0;
 
-       if (dsize == 0) {
+       if (i_dsize == 0) {
                if (numhosts > 1)
                        fprintf(stderr, "server=%s ", currenthost);
                fprintf(stderr, "***No sysvar information returned\n");

diff --git a/ntpsnmpd/ntpsnmpd.c b/ntpsnmpd/ntpsnmpd.c
index 0a98a3b2bdc99bb9c12683ef6d0a7fad87e7e2cf..278d5a86e17092f33fba6e51cb136f6edca0edcb 100644 (file)
--- a/ntpsnmpd/ntpsnmpd.c
+++ b/ntpsnmpd/ntpsnmpd.c
@@ -32,6 +32,7 @@
 #include <ntpsnmpd-opts.h>
 
 static int keep_running;
+RETSIGTYPE stop_server(int);
 
 RETSIGTYPE
 stop_server(int a) {
@@ -46,8 +47,6 @@ int
 main (int argc, char **argv) {
   int background = 0; /* start as background process */
   int use_syslog = 1; /* use syslog for logging */
-  char varvalue[1024];
-       
 
        {
                int optct = optionProcess(&ntpsnmpdOptions, argc, argv);