Module Name: src
Committed By: joerg
Date: Fri Jan 3 20:26:45 UTC 2014
Modified Files:
src/external/bsd/ntp/dist/libntp: socktoa.c
src/external/bsd/ntp/dist/ntpq: ntpq-subs.c
Log Message:
Don't bother with the h (short) modifier. The predicated use of bswap16
confuses the type tracking in clang and the use here is not portable
anyway, since it assumes short == int16_t.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/ntp/dist/libntp/socktoa.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/ntpq/ntpq-subs.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/libntp/socktoa.c
diff -u src/external/bsd/ntp/dist/libntp/socktoa.c:1.1.1.3 src/external/bsd/ntp/dist/libntp/socktoa.c:1.2
--- src/external/bsd/ntp/dist/libntp/socktoa.c:1.1.1.3 Fri Dec 27 23:30:48 2013
+++ src/external/bsd/ntp/dist/libntp/socktoa.c Fri Jan 3 20:26:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: socktoa.c,v 1.1.1.3 2013/12/27 23:30:48 christos Exp $ */
+/* $NetBSD: socktoa.c,v 1.2 2014/01/03 20:26:45 joerg Exp $ */
/*
* socktoa.c socktoa(), sockporttoa(), and sock_hash()
@@ -93,8 +93,8 @@ sockporttoa(
LIB_GETBUF(buf);
snprintf(buf, LIB_BUFLENGTH,
(IS_IPV6(sock))
- ? "[%s]:%hu"
- : "%s:%hu",
+ ? "[%s]:%u"
+ : "%s:%u",
atext, SRCPORT(sock));
errno = saved_errno;
Index: src/external/bsd/ntp/dist/ntpq/ntpq-subs.c
diff -u src/external/bsd/ntp/dist/ntpq/ntpq-subs.c:1.6 src/external/bsd/ntp/dist/ntpq/ntpq-subs.c:1.7
--- src/external/bsd/ntp/dist/ntpq/ntpq-subs.c:1.6 Mon Dec 30 01:34:22 2013
+++ src/external/bsd/ntp/dist/ntpq/ntpq-subs.c Fri Jan 3 20:26:45 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ntpq-subs.c,v 1.6 2013/12/30 01:34:22 christos Exp $ */
+/* $NetBSD: ntpq-subs.c,v 1.7 2014/01/03 20:26:45 joerg Exp $ */
/*
* ntpq-subs.c - subroutines which are called to perform ntpq commands.
@@ -3036,7 +3036,7 @@ mrulist(
LFPTOD(&interval, favgint);
favgint /= recent->count;
avgint = (int)(favgint + 0.5);
- fprintf(fp, "%6d %6d %4hx %c %d %d %6d %5hu %s\n",
+ fprintf(fp, "%6d %6d %4hx %c %d %d %6d %5u %s\n",
lstint, avgint, recent->rs,
(RES_KOD & recent->rs)
? 'K'
