Rename EXTRACT_ macros

[tcpdump] / print-m3ua.c

diff --git a/print-m3ua.c b/print-m3ua.c
index 54b218dab4fa996767a38733f813da0cb2defbd6..163b645061eb24cbb5940a8dccd92613160fe876 100644 (file)
--- a/print-m3ua.c
+++ b/print-m3ua.c
@@ -220,7 +220,7 @@ tag_value_print(netdissect_options *ndo,
     if (size < 4)
       goto invalid;
     ND_TCHECK2(*buf, size);
-    ND_PRINT((ndo, "0x%08x", EXTRACT_BE_32BITS(buf)));
+    ND_PRINT((ndo, "0x%08x", EXTRACT_BE_U_4(buf)));
     break;
   /* ... */
   default:
@@ -262,10 +262,10 @@ m3ua_tags_print(netdissect_options *ndo,
       goto invalid;
     ND_TCHECK2(*p, sizeof(struct m3ua_param_header));
     /* Parameter Tag */
-    hdr_tag = EXTRACT_BE_16BITS(p);
+    hdr_tag = EXTRACT_BE_U_2(p);
     ND_PRINT((ndo, "\n\t\t\t%s: ", tok2str(ParamName, "Unknown Parameter (0x%04x)", hdr_tag)));
     /* Parameter Length */
-    hdr_len = EXTRACT_BE_16BITS(p + 2);
+    hdr_len = EXTRACT_BE_U_2(p + 2);
     if (hdr_len < sizeof(struct m3ua_param_header))
       goto invalid;
     /* Parameter Value */
@@ -323,11 +323,11 @@ m3ua_print(netdissect_options *ndo,
   if (dict != NULL)
     ND_PRINT((ndo, " %s Message", tok2str(dict, "Unknown (0x%02x)", hdr->msg_type)));
 
-  if (size != EXTRACT_BE_32BITS(&hdr->len))
-    ND_PRINT((ndo, "\n\t\t\t@@@@@@ Corrupted length %u of message @@@@@@", EXTRACT_BE_32BITS(&hdr->len)));
+  if (size != EXTRACT_BE_U_4(&hdr->len))
+    ND_PRINT((ndo, "\n\t\t\t@@@@@@ Corrupted length %u of message @@@@@@", EXTRACT_BE_U_4(&hdr->len)));
   else
     m3ua_tags_print(ndo, buf + sizeof(struct m3ua_common_header),
-                    EXTRACT_BE_32BITS(&hdr->len) - sizeof(struct m3ua_common_header));
+                    EXTRACT_BE_U_4(&hdr->len) - sizeof(struct m3ua_common_header));
   return;
 
 invalid: