Rename EXTRACT_ macros

[tcpdump] / print-zeromq.c

diff --git a/print-zeromq.c b/print-zeromq.c
index 9666553439230989a1b15ee633fb06e4b3b374b5..41d636c2832d5e39ec4400058c9cda1eca486ece 100644 (file)
--- a/print-zeromq.c
+++ b/print-zeromq.c
@@ -90,7 +90,7 @@ zmtp1_print_frame(netdissect_options *ndo, const u_char *cp, const u_char *ep)
                header_len = 1 + 8; /* 0xFF, length */
                ND_PRINT((ndo, " frame flags+body (64-bit) length"));
                ND_TCHECK2(*cp, header_len); /* 0xFF, length */
-               body_len_declared = EXTRACT_BE_64BITS(cp + 1);
+               body_len_declared = EXTRACT_BE_U_8(cp + 1);
                ND_PRINT((ndo, " %" PRIu64, body_len_declared));
        }
        if (body_len_declared == 0)
@@ -173,7 +173,7 @@ zmtp1_print_intermediate_part(netdissect_options *ndo, const u_char *cp, const u
        uint64_t remaining_len;
 
        ND_TCHECK2(*cp, 2);
-       frame_offset = EXTRACT_BE_16BITS(cp);
+       frame_offset = EXTRACT_BE_U_2(cp);
        ND_PRINT((ndo, "\n\t frame offset 0x%04x", frame_offset));
        cp += 2;
        remaining_len = ndo->ndo_snapend - cp; /* without the frame length */