Use more the ND_TTEST_1() macro

[tcpdump] / print-otv.c

diff --git a/print-otv.c b/print-otv.c
index 7c3e7b119d5b5d285af9f4196bd83873e15de2ed..502f93e419810c0aea6c68c85c48b5d4bdee4dcd 100644 (file)
--- a/print-otv.c
+++ b/print-otv.c
@@ -49,21 +49,21 @@ otv_print(netdissect_options *ndo, const u_char *bp, u_int len)
     if (len < OTV_HDR_LEN)
         goto trunc;
 
-    ND_TCHECK(*bp);
-    flags = *bp;
+    ND_TCHECK_1(bp);
+    flags = EXTRACT_U_1(bp);
     ND_PRINT((ndo, "flags [%s] (0x%02x), ", flags & 0x08 ? "I" : ".", flags));
     bp += 1;
 
-    ND_TCHECK2(*bp, 3);
-    ND_PRINT((ndo, "overlay %u, ", EXTRACT_BE_24BITS(bp)));
+    ND_TCHECK_3(bp);
+    ND_PRINT((ndo, "overlay %u, ", EXTRACT_BE_U_3(bp)));
     bp += 3;
 
-    ND_TCHECK2(*bp, 3);
-    ND_PRINT((ndo, "instance %u\n", EXTRACT_BE_24BITS(bp)));
+    ND_TCHECK_3(bp);
+    ND_PRINT((ndo, "instance %u\n", EXTRACT_BE_U_3(bp)));
     bp += 3;
 
     /* Reserved */
-    ND_TCHECK(*bp);
+    ND_TCHECK_1(bp);
     bp += 1;
 
     ether_print(ndo, bp, len - OTV_HDR_LEN, ndo->ndo_snapend - bp, NULL, NULL);