[src/trunk]: src/external/bsd/ntp/dist cleanup printf fmt differences between...

[kardel <kardel%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e2c864ad7c3c
branches:  trunk
changeset: 773429:e2c864ad7c3c
user:      kardel <kardel%NetBSD.org@localhost>
date:      Wed Feb 01 22:48:15 2012 +0000

description:
cleanup printf fmt differences between i386/amd64

diffstat:

 external/bsd/ntp/dist/ntpd/ntp_request.c |   6 +++---
 external/bsd/ntp/dist/ntpdc/ntpdc.c      |   4 ++--
 external/bsd/ntp/dist/ntpq/ntpq.c        |  12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diffs (84 lines):

diff -r 7fe010772e45 -r e2c864ad7c3c external/bsd/ntp/dist/ntpd/ntp_request.c
--- a/external/bsd/ntp/dist/ntpd/ntp_request.c  Wed Feb 01 22:35:30 2012 +0000
+++ b/external/bsd/ntp/dist/ntpd/ntp_request.c  Wed Feb 01 22:48:15 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntp_request.c,v 1.6 2012/02/01 07:46:22 kardel Exp $   */
+/*     $NetBSD: ntp_request.c,v 1.7 2012/02/01 22:48:15 kardel Exp $   */
 
 /*
  * ntp_request.c - respond to information requests
@@ -584,13 +584,13 @@
                 */
                if (!INFO_IS_AUTH(inpkt->auth_seq) || !info_auth_keyid
                    || ntohl(tailinpkt->keyid) != info_auth_keyid) {
-                       DPRINTF(5, ("failed auth %d info_auth_keyid %u pkt keyid %u maclen %zu\n",
+                       DPRINTF(5, ("failed auth %d info_auth_keyid %u pkt keyid %u maclen %lu\n",
                                    INFO_IS_AUTH(inpkt->auth_seq),
                                    info_auth_keyid,
                                    ntohl(tailinpkt->keyid), (u_long)mac_len));
 #ifdef DEBUG
                        msyslog(LOG_DEBUG,
-                               "process_private: failed auth %d info_auth_keyid %u pkt keyid %u maclen %zu\n",
+                               "process_private: failed auth %d info_auth_keyid %u pkt keyid %u maclen %lu\n",
                                INFO_IS_AUTH(inpkt->auth_seq),
                                info_auth_keyid,
                                ntohl(tailinpkt->keyid), (u_long)mac_len);
diff -r 7fe010772e45 -r e2c864ad7c3c external/bsd/ntp/dist/ntpdc/ntpdc.c
--- a/external/bsd/ntp/dist/ntpdc/ntpdc.c       Wed Feb 01 22:35:30 2012 +0000
+++ b/external/bsd/ntp/dist/ntpdc/ntpdc.c       Wed Feb 01 22:48:15 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntpdc.c,v 1.4 2012/02/01 07:46:23 kardel Exp $ */
+/*     $NetBSD: ntpdc.c,v 1.5 2012/02/01 22:48:15 kardel Exp $ */
 
 /*
  * ntpdc - control and monitor your ntpd daemon
@@ -1782,7 +1782,7 @@
        int             key_type;
 
        if (!pcmd->nargs) {
-               fprintf(fp, "keytype is %s with %zu octet digests\n",
+               fprintf(fp, "keytype is %s with %lu octet digests\n",
                        keytype_name(info_auth_keytype),
                        (u_long)info_auth_hashlen);
                return;
diff -r 7fe010772e45 -r e2c864ad7c3c external/bsd/ntp/dist/ntpq/ntpq.c
--- a/external/bsd/ntp/dist/ntpq/ntpq.c Wed Feb 01 22:35:30 2012 +0000
+++ b/external/bsd/ntp/dist/ntpq/ntpq.c Wed Feb 01 22:48:15 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ntpq.c,v 1.5 2012/02/01 20:48:01 kardel Exp $  */
+/*     $NetBSD: ntpq.c,v 1.6 2012/02/01 22:48:15 kardel Exp $  */
 
 /*
  * ntpq - query an NTP server using mode 6 commands
@@ -1031,9 +1031,9 @@
 
                if (n < shouldbesize) {
                        printf("Response packet claims %u octets "
-                               "payload, above %ld received\n",
+                               "payload, above %u received\n",
                                count,
-                               n - CTL_HEADER_LEN
+                               (u_int)(n - CTL_HEADER_LEN)
                                );
                        return ERR_INCOMPLETE;
                }
@@ -1083,8 +1083,8 @@
                if ((int)count > (n - CTL_HEADER_LEN)) {
                        if (debug)
                                printf("Received count of %d octets, "
-                                       "data in packet is %lu\n",
-                                       count, n-CTL_HEADER_LEN);
+                                       "data in packet is %u\n",
+                                       count, (u_int)(n-CTL_HEADER_LEN));
                        continue;
                }
                if (count == 0 && CTL_ISMORE(rpkt.r_m_e_op)) {
@@ -2448,7 +2448,7 @@
        int             key_type;
 
        if (!pcmd->nargs) {
-               fprintf(fp, "keytype is %s with %zu octet digests\n",
+               fprintf(fp, "keytype is %s with %lu octet digests\n",
                        keytype_name(info_auth_keytype),
                        (u_long)info_auth_hashlen);
                return;