Rename EXTRACT_ macros

[tcpdump] / print-sunrpc.c

diff --git a/print-sunrpc.c b/print-sunrpc.c
index 0e7af1b799347c3d072cc20b11595b2af8338224..ce8b039348b5a1fc39dbb1b1b8c79d161f26a35a 100644 (file)
--- a/print-sunrpc.c
+++ b/print-sunrpc.c
@@ -178,11 +178,11 @@ sunrpc_print(netdissect_options *ndo, register const u_char *bp,
 
        if (!ndo->ndo_nflag) {
                snprintf(srcid, sizeof(srcid), "0x%x",
-                   EXTRACT_BE_32BITS(&rp->rm_xid));
+                   EXTRACT_BE_U_4(&rp->rm_xid));
                strlcpy(dstid, "sunrpc", sizeof(dstid));
        } else {
                snprintf(srcid, sizeof(srcid), "0x%x",
-                   EXTRACT_BE_32BITS(&rp->rm_xid));
+                   EXTRACT_BE_U_4(&rp->rm_xid));
                snprintf(dstid, sizeof(dstid), "0x%x", SUNRPC_PMAPPORT);
        }
 
@@ -205,23 +205,23 @@ sunrpc_print(netdissect_options *ndo, register const u_char *bp,
        }
 
        ND_PRINT((ndo, " %s", tok2str(proc2str, " proc #%u",
-           EXTRACT_BE_32BITS(&rp->rm_call.cb_proc))));
-       x = EXTRACT_BE_32BITS(&rp->rm_call.cb_rpcvers);
+           EXTRACT_BE_U_4(&rp->rm_call.cb_proc))));
+       x = EXTRACT_BE_U_4(&rp->rm_call.cb_rpcvers);
        if (x != 2)
                ND_PRINT((ndo, " [rpcver %u]", x));
 
-       switch (EXTRACT_BE_32BITS(&rp->rm_call.cb_proc)) {
+       switch (EXTRACT_BE_U_4(&rp->rm_call.cb_proc)) {
 
        case SUNRPC_PMAPPROC_SET:
        case SUNRPC_PMAPPROC_UNSET:
        case SUNRPC_PMAPPROC_GETPORT:
        case SUNRPC_PMAPPROC_CALLIT:
-               x = EXTRACT_BE_32BITS(&rp->rm_call.cb_prog);
+               x = EXTRACT_BE_U_4(&rp->rm_call.cb_prog);
                if (!ndo->ndo_nflag)
                        ND_PRINT((ndo, " %s", progstr(x)));
                else
                        ND_PRINT((ndo, " %u", x));
-               ND_PRINT((ndo, ".%u", EXTRACT_BE_32BITS(&rp->rm_call.cb_vers)));
+               ND_PRINT((ndo, ".%u", EXTRACT_BE_U_4(&rp->rm_call.cb_vers)));
                break;
        }
 }