[src/trunk]: src/external/bsd/ntp/dist Don't bother with the h (short) modifi...

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

details:   https://anonhg.NetBSD.org/src/rev/f780b34d2cd2
branches:  trunk
changeset: 325704:f780b34d2cd2
user:      joerg <joerg%NetBSD.org@localhost>
date:      Fri Jan 03 20:26:45 2014 +0000

description:
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.

diffstat:

 external/bsd/ntp/dist/libntp/socktoa.c |  6 +++---
 external/bsd/ntp/dist/ntpq/ntpq-subs.c |  4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (38 lines):

diff -r 24bc760fa05c -r f780b34d2cd2 external/bsd/ntp/dist/libntp/socktoa.c
--- a/external/bsd/ntp/dist/libntp/socktoa.c    Fri Jan 03 20:18:45 2014 +0000
+++ b/external/bsd/ntp/dist/libntp/socktoa.c    Fri Jan 03 20:26:45 2014 +0000
@@ -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 @@
        LIB_GETBUF(buf);
        snprintf(buf, LIB_BUFLENGTH,
                 (IS_IPV6(sock))
-                    ? "[%s]:%hu"
-                    : "%s:%hu",
+                    ? "[%s]:%u"
+                    : "%s:%u",
                 atext, SRCPORT(sock));
        errno = saved_errno;
 
diff -r 24bc760fa05c -r f780b34d2cd2 external/bsd/ntp/dist/ntpq/ntpq-subs.c
--- a/external/bsd/ntp/dist/ntpq/ntpq-subs.c    Fri Jan 03 20:18:45 2014 +0000
+++ b/external/bsd/ntp/dist/ntpq/ntpq-subs.c    Fri Jan 03 20:26:45 2014 +0000
@@ -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 @@
                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'