Fix the pointer tests in the non-ndoified TTEST2() macro as well.

[tcpdump] / print-ntp.c

diff --git a/print-ntp.c b/print-ntp.c
index 93268ac017b50b024d98cb93a156df099cbdc81f..e83d47a7dd58db4b0d478a47398f1d8f22865d27 100644 (file)
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -66,13 +66,13 @@
  *   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 */
 struct l_fixedpt {
-       u_int32_t int_part;
-       u_int32_t fraction;
+       uint32_t int_part;
+       uint32_t fraction;
 };
 
 struct s_fixedpt {
-       u_int16_t int_part;
-       u_int16_t fraction;
+       uint16_t int_part;
+       uint16_t fraction;
 };
 
 /* rfc2030
@@ -120,13 +120,13 @@ struct ntpdata {
        int precision:8;
        struct s_fixedpt root_delay;
        struct s_fixedpt root_dispersion;
-       u_int32_t refid;
+       uint32_t refid;
        struct l_fixedpt ref_timestamp;
        struct l_fixedpt org_timestamp;
        struct l_fixedpt rec_timestamp;
        struct l_fixedpt xmt_timestamp;
-        u_int32_t key_id;
-        u_int8_t  message_digest[16];
+        uint32_t key_id;
+        uint8_t  message_digest[16];
 };
 /*
  *     Leap Second Codes (high order two bits)
@@ -261,7 +261,7 @@ ntp_print(netdissect_options *ndo,
                break;
 
        case PRIM_REF:
-               if (fn_printn((u_char *)&(bp->refid), 4, ndo->ndo_snapend))
+               if (fn_printn(ndo, (u_char *)&(bp->refid), 4, ndo->ndo_snapend))
                        goto trunc;
                break;
 
@@ -343,8 +343,8 @@ p_ntp_time(netdissect_options *ndo,
            register const struct l_fixedpt *lfp)
 {
        register int32_t i;
-       register u_int32_t uf;
-       register u_int32_t f;
+       register uint32_t uf;
+       register uint32_t f;
        register float ff;
 
        i = EXTRACT_32BITS(&lfp->int_part);
@@ -379,9 +379,9 @@ p_ntp_delta(netdissect_options *ndo,
             register const struct l_fixedpt *lfp)
 {
        register int32_t i;
-       register u_int32_t u, uf;
-       register u_int32_t ou, ouf;
-       register u_int32_t f;
+       register uint32_t u, uf;
+       register uint32_t ou, ouf;
+       register uint32_t f;
        register float ff;
        int signbit;