[Bug 2821] Add a missing NTP_PRINTF and a missing const

bk: 554c717aU0kSdshrtLJS7lmsn6hCqQ

diff --git a/ChangeLog b/ChangeLog
index 020183a6ec1fcc26d95a5a215beadd86152a39e0..32e9e8b5b21b4729af376f5b7b83abdc9826d9bf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -25,6 +25,7 @@
 * [Bug 2810] refclock_shm.c memory barrier code needs tweaks for QNX.
 * [Bug 2813] HP-UX needs -D__STDC_VERSION__=199901L and limits.h.
 * [Bug 2815] net-snmp before v5.4 has circular library dependencies.
+* [Bug 2821] Add a missing NTP_PRINTF and a missing const.
 * [Bug 2822] New leap column in sntp broke NTP::Util.pm.
 * [Bug 2825] Quiet file installation in html/ .
 * Add an assert to the ntpq ifstats code.

diff --git a/ntpd/refclock_gpsdjson.c b/ntpd/refclock_gpsdjson.c
index ad1027bf2e32e035a1c539c512860ebf51666a3d..99a3b096c971f91a68baf56a054ec3348b30e1d0 100644 (file)
--- a/ntpd/refclock_gpsdjson.c
+++ b/ntpd/refclock_gpsdjson.c
@@ -258,7 +258,7 @@ static      void    gpsd_control    (int, const struct refclockstat *,
                                 struct refclockstat *, peerT *);
 static void    gpsd_timer      (int, peerT *);
 
-static  int     myasprintf(char**, char const*, ...);
+static  int     myasprintf(char**, char const*, ...) NTP_PRINTF(2, 3);
 
 static void     enter_opmode(peerT *peer, int mode);
 static void    leave_opmode(peerT *peer, int mode);

diff --git a/sntp/main.c b/sntp/main.c
index 20e27f0fec300fe8d4ba14d614919220971457b2..870db93502b9fd00daf01d34a6dbe7d87a70d277 100644 (file)
--- a/sntp/main.c
+++ b/sntp/main.c
@@ -1161,7 +1161,7 @@ handle_pkt(
        int             stratum;
        char *          ref;
        char *          ts_str;
-       char *          leaptxt;
+       const char *    leaptxt;
        double          offset;
        double          precision;
        double          synch_distance;