Module Name: src
Committed By: kardel
Date: Wed Feb 1 22:48:16 UTC 2012
Modified Files:
src/external/bsd/ntp/dist/ntpd: ntp_request.c
src/external/bsd/ntp/dist/ntpdc: ntpdc.c
src/external/bsd/ntp/dist/ntpq: ntpq.c
Log Message:
cleanup printf fmt differences between i386/amd64
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/ntpd/ntp_request.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/ntpdc/ntpdc.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/ntpq/ntpq.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_request.c
diff -u src/external/bsd/ntp/dist/ntpd/ntp_request.c:1.6 src/external/bsd/ntp/dist/ntpd/ntp_request.c:1.7
--- src/external/bsd/ntp/dist/ntpd/ntp_request.c:1.6 Wed Feb 1 07:46:22 2012
+++ src/external/bsd/ntp/dist/ntpd/ntp_request.c Wed Feb 1 22:48:15 2012
@@ -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 @@ process_private(
*/
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);
Index: src/external/bsd/ntp/dist/ntpdc/ntpdc.c
diff -u src/external/bsd/ntp/dist/ntpdc/ntpdc.c:1.4 src/external/bsd/ntp/dist/ntpdc/ntpdc.c:1.5
--- src/external/bsd/ntp/dist/ntpdc/ntpdc.c:1.4 Wed Feb 1 07:46:23 2012
+++ src/external/bsd/ntp/dist/ntpdc/ntpdc.c Wed Feb 1 22:48:15 2012
@@ -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 @@ keytype(
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;
Index: src/external/bsd/ntp/dist/ntpq/ntpq.c
diff -u src/external/bsd/ntp/dist/ntpq/ntpq.c:1.5 src/external/bsd/ntp/dist/ntpq/ntpq.c:1.6
--- src/external/bsd/ntp/dist/ntpq/ntpq.c:1.5 Wed Feb 1 20:48:01 2012
+++ src/external/bsd/ntp/dist/ntpq/ntpq.c Wed Feb 1 22:48:15 2012
@@ -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 @@ getresponse(
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 @@ getresponse(
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 @@ keytype(
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;
