From: Guy Harris <guy@alum.mit.edu>
Date: Sun, 19 Nov 2017 02:55:54 +0000 (-0800)
Subject: Use EXTRACT_8BITS() in one case.
X-Git-Tag: tcpdump-4.99-bp~1762
X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/518768cf72d47710479aab64508dc78422128999

Use EXTRACT_8BITS() in one case.
---

diff --git a/print-isoclns.c b/print-isoclns.c
index c8110292..cbd33a2c 100644
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -770,7 +770,7 @@ clnp_print(netdissect_options *ndo,
         u_int li,tlen,nsap_offset,source_address_length,dest_address_length, clnp_pdu_type, clnp_flags;
 	const struct clnp_header_t *clnp_header;
 	const struct clnp_segment_header_t *clnp_segment_header;
-        uint8_t rfd_error_major,rfd_error_minor;
+        uint8_t rfd_error,rfd_error_major,rfd_error_minor;
 
 	clnp_header = (const struct clnp_header_t *) pptr;
         ND_TCHECK(*clnp_header);
@@ -1005,8 +1005,9 @@ clnp_print(netdissect_options *ndo,
                         ND_PRINT((ndo, ", bad opt len"));
                         return (0);
                 }
-                rfd_error_major = (*tptr&0xf0) >> 4;
-                rfd_error_minor = *tptr&0x0f;
+                rfd_error = EXTRACT_8BITS(tptr);
+                rfd_error_major = (rfd_error&0xf0) >> 4;
+                rfd_error_minor = rfd_error&0x0f;
                 ND_PRINT((ndo, "\n\t    Class: %s Error (0x%01x), %s (0x%01x)",
                        tok2str(clnp_option_rfd_class_values,"Unknown",rfd_error_major),
                        rfd_error_major,