Cleanup some warnings that crept in.

bk: 3e04b69bOpNQFzDWOW5lxKzGAsdd9A

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 05351cd11b1697d12d54826390238ae3f268c60a..2b1048c4b2874d44361884b35ae7ca5ac4e87198 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -1272,7 +1272,7 @@ open_socket(
                else return INVALID_SOCKET;
 
                msyslog(LOG_ERR, buff);
-               close_socket(fd);
+               closesocket(fd);
 
                /*
                 * soft fail if opening a multicast address

diff --git a/ntpd/ntp_request.c b/ntpd/ntp_request.c
index 0531324ae29a7e7c3bab73242db5c622ae55f8b1..bfd38292fc81c9538fae6ad419f59b893ee4250a 100644 (file)
--- a/ntpd/ntp_request.c
+++ b/ntpd/ntp_request.c
@@ -436,7 +436,7 @@ process_private(
            || (++ec, INFO_MBZ(inpkt->mbz_itemsize) != 0)
            || (++ec, rbufp->recv_length < REQ_LEN_HDR)
                ) {
-               msyslog(LOG_ERR, "process_private: INFO_ERR_FMT: test %d failed, pkt from %s", ec, stoa(&srcadr));
+               msyslog(LOG_ERR, "process_private: INFO_ERR_FMT: test %d failed, pkt from %s", ec, stoa(srcadr));
                req_ack(srcadr, inter, inpkt, INFO_ERR_FMT);
                return;
        }

diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index 13db9da0c77b418656e52130c552f99a24131934..c0b9d202e9deb8159748fbc383352fb80fa032db 100644 (file)
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -365,7 +365,7 @@ char currenthost[LENHOSTNAME];                      /* current host name */
 struct sockaddr_in hostaddr = { 0 };           /* host address */
 int showhostnames = 1;                         /* show host names by default */
 
-int ai_fam_templ;                      /* address family */
+int ai_fam_templ;                              /* address family */
 SOCKET sockfd;                                 /* fd socket is opened on */
 int havehost = 0;                              /* set to 1 when host open */
 int s_port = 0;
@@ -490,7 +490,6 @@ ntpqmain(
        int errflg = 0;
        extern int ntp_optind;
        extern char *ntp_optarg;
-       int ai_fam_templ;
 
 #ifdef NO_MAIN_ALLOWED
     clear_globals();