Rename EXTRACT_ macros

[tcpdump] / print-sl.c

diff --git a/print-sl.c b/print-sl.c
index a4a05fb102dcea02ce300c2cb7e38320422426cb..1e329cf4367a71107fba7dc3fc0fb194e183a3fd 100644 (file)
--- a/print-sl.c
+++ b/print-sl.c
@@ -199,7 +199,7 @@ print_sl_change(netdissect_options *ndo,
        register u_int i;
 
        if ((i = *cp++) == 0) {
-               i = EXTRACT_BE_16BITS(cp);
+               i = EXTRACT_BE_U_2(cp);
                cp += 2;
        }
        ND_PRINT((ndo, " %s%d", str, i));
@@ -213,7 +213,7 @@ print_sl_winchange(netdissect_options *ndo,
        register short i;
 
        if ((i = *cp++) == 0) {
-               i = EXTRACT_BE_16BITS(cp);
+               i = EXTRACT_BE_U_2(cp);
                cp += 2;
        }
        if (i >= 0)
@@ -231,10 +231,10 @@ compressed_sl_print(netdissect_options *ndo,
        register const u_char *cp = chdr;
        register u_int flags, hlen;
 
-       flags = EXTRACT_8BITS(cp);
+       flags = EXTRACT_U_1(cp);
        cp++;
        if (flags & NEW_C) {
-               lastconn = EXTRACT_8BITS(cp);
+               lastconn = EXTRACT_U_1(cp);
                cp++;
                ND_PRINT((ndo, "ctcp %d", lastconn));
        } else