Use ND_TTEST_SIZE()/ND_TCHECK_SIZE() macros (2/n)

diff --git a/print-atm.c b/print-atm.c
index 6650385ac7a582ea3d3720a783d60d8c1f55cbf4..3a828df179b8a0e23fec2085b81f2fad98a4c564 100644 (file)
--- a/print-atm.c
+++ b/print-atm.c
@@ -496,7 +496,7 @@ oam_print (netdissect_options *ndo,
     switch (cell_type << 4 | func_type) {
     case (OAM_CELLTYPE_FM << 4 | OAM_FM_FUNCTYPE_LOOPBACK):
         oam_ptr.oam_fm_loopback = (const struct oam_fm_loopback_t *)(p + OAM_CELLTYPE_FUNCTYPE_LEN);
-        ND_TCHECK(*oam_ptr.oam_fm_loopback);
+        ND_TCHECK_SIZE(oam_ptr.oam_fm_loopback);
         ND_PRINT((ndo, "\n\tLoopback-Indicator %s, Correlation-Tag 0x%08x",
                tok2str(oam_fm_loopback_indicator_values,
                        "Unknown",
@@ -519,7 +519,7 @@ oam_print (netdissect_options *ndo,
     case (OAM_CELLTYPE_FM << 4 | OAM_FM_FUNCTYPE_AIS):
     case (OAM_CELLTYPE_FM << 4 | OAM_FM_FUNCTYPE_RDI):
         oam_ptr.oam_fm_ais_rdi = (const struct oam_fm_ais_rdi_t *)(p + OAM_CELLTYPE_FUNCTYPE_LEN);
-        ND_TCHECK(*oam_ptr.oam_fm_ais_rdi);
+        ND_TCHECK_SIZE(oam_ptr.oam_fm_ais_rdi);
         ND_PRINT((ndo, "\n\tFailure-type 0x%02x", EXTRACT_U_1(oam_ptr.oam_fm_ais_rdi->failure_type)));
         ND_PRINT((ndo, "\n\tLocation-ID "));
         for (idx = 0; idx < sizeof(oam_ptr.oam_fm_ais_rdi->failure_location); idx++) {

diff --git a/print-cfm.c b/print-cfm.c
index fe6954e15456436509a6e804ed545b9377037a3a..40565af83f8dc646151b8af3bf2eef1c995b2f10 100644 (file)
--- a/print-cfm.c
+++ b/print-cfm.c
@@ -345,7 +345,7 @@ cfm_print(netdissect_options *ndo,
         }
         if (tlen < sizeof(*msg_ptr.cfm_ccm))
             goto tooshort;
-        ND_TCHECK(*msg_ptr.cfm_ccm);
+        ND_TCHECK_SIZE(msg_ptr.cfm_ccm);
 
         ccm_interval = CFM_EXTRACT_CCM_INTERVAL(flags);
         ND_PRINT((ndo, ", Flags [CCM Interval %u%s]",
@@ -475,7 +475,7 @@ cfm_print(netdissect_options *ndo,
         }
         if (tlen < sizeof(*msg_ptr.cfm_ltm))
             goto tooshort;
-        ND_TCHECK(*msg_ptr.cfm_ltm);
+        ND_TCHECK_SIZE(msg_ptr.cfm_ltm);
 
         ND_PRINT((ndo, ", Flags [%s]",
                bittok2str(cfm_ltm_flag_values, "none", flags)));
@@ -498,7 +498,7 @@ cfm_print(netdissect_options *ndo,
         }
         if (tlen < sizeof(*msg_ptr.cfm_ltr))
             goto tooshort;
-        ND_TCHECK(*msg_ptr.cfm_ltr);
+        ND_TCHECK_SIZE(msg_ptr.cfm_ltr);
 
         ND_PRINT((ndo, ", Flags [%s]",
                bittok2str(cfm_ltr_flag_values, "none", flags)));

diff --git a/print-ip.c b/print-ip.c
index 4f916bc67a5d98aea3224d13246dd163fc60e219..b00c751796fb1a5a657927b0792a3b722e844feb 100644 (file)
--- a/print-ip.c
+++ b/print-ip.c
@@ -556,7 +556,7 @@ ip_print(netdissect_options *ndo,
        if (!ndo->ndo_eflag)
                ND_PRINT((ndo, "IP "));
 
-       ND_TCHECK(*ipds->ip);
+       ND_TCHECK_SIZE(ipds->ip);
        if (length < sizeof (struct ip)) {
                ND_PRINT((ndo, "truncated-ip %u", length));
                return;

diff --git a/print-slow.c b/print-slow.c
index d1afe7255b708ea6a7a67737c8f097373e0c8d38..7d57537477c588f88c77a176852f0a06ab76cd18 100644 (file)
--- a/print-slow.c
+++ b/print-slow.c
@@ -522,7 +522,7 @@ slow_oam_print(netdissect_options *ndo,
     ptr.slow_oam_common_header = (const struct slow_oam_common_header_t *)tptr;
     if (tlen < sizeof(*ptr.slow_oam_common_header))
         goto tooshort;
-    ND_TCHECK(*ptr.slow_oam_common_header);
+    ND_TCHECK_SIZE(ptr.slow_oam_common_header);
     tptr += sizeof(struct slow_oam_common_header_t);
     tlen -= sizeof(struct slow_oam_common_header_t);
 
@@ -539,7 +539,7 @@ slow_oam_print(netdissect_options *ndo,
             ptr.slow_oam_tlv_header = (const struct slow_oam_tlv_header_t *)tptr;
             if (tlen < sizeof(*ptr.slow_oam_tlv_header))
                 goto tooshort;
-            ND_TCHECK(*ptr.slow_oam_tlv_header);
+            ND_TCHECK_SIZE(ptr.slow_oam_tlv_header);
             type = EXTRACT_U_1(ptr.slow_oam_tlv_header->type);
             length = EXTRACT_U_1(ptr.slow_oam_tlv_header->length);
             ND_PRINT((ndo, "\n\t  %s Information Type (%u), length %u",
@@ -637,7 +637,7 @@ slow_oam_print(netdissect_options *ndo,
             ptr.slow_oam_tlv_header = (const struct slow_oam_tlv_header_t *)tptr;
             if (tlen < sizeof(*ptr.slow_oam_tlv_header))
                 goto tooshort;
-            ND_TCHECK(*ptr.slow_oam_tlv_header);
+            ND_TCHECK_SIZE(ptr.slow_oam_tlv_header);
             type = EXTRACT_U_1(ptr.slow_oam_tlv_header->type);
             length = EXTRACT_U_1(ptr.slow_oam_tlv_header->length);
             ND_PRINT((ndo, "\n\t  %s Link Event Type (%u), length %u",
@@ -719,7 +719,7 @@ slow_oam_print(netdissect_options *ndo,
         tlv.slow_oam_loopbackctrl = (const struct slow_oam_loopbackctrl_t *)tptr;
         if (tlen < sizeof(*tlv.slow_oam_loopbackctrl))
             goto tooshort;
-        ND_TCHECK(*tlv.slow_oam_loopbackctrl);
+        ND_TCHECK_SIZE(tlv.slow_oam_loopbackctrl);
         command = EXTRACT_U_1(tlv.slow_oam_loopbackctrl->command);
         ND_PRINT((ndo, "\n\t  Command %s (%u)",
                tok2str(slow_oam_loopbackctrl_cmd_values,

diff --git a/print-zephyr.c b/print-zephyr.c
index 735e273f0770bff33fa1dc962a497eb5514bae1e..bce894a4ccbcf622bb8fb7d7dabcfa121e06fd3e 100644 (file)
--- a/print-zephyr.c
+++ b/print-zephyr.c
@@ -95,7 +95,7 @@ parse_field(netdissect_options *ndo, const char **pptr, int *len, int *truncated
            /* Ran out of packet data without finding it */
            return NULL;
        }
-       if (!ND_TTEST(**pptr)) {
+       if (!ND_TTEST_SIZE(*pptr)) {
            /* Ran out of captured data without finding it */
            *truncated = 1;
            return NULL;