Use more the EXTRACT_8BITS() macro to fetch a one-byte value (15/n)

Assignment, one operator (step 2).
(*e1) op e2

diff --git a/print-atm.c b/print-atm.c
index c8a16ba6dc4a7c702e500174cb7815d432bc113b..bb7eaf3b7d9152108b182e910d83cbddff4dd04c 100644 (file)
--- a/print-atm.c
+++ b/print-atm.c
@@ -463,7 +463,7 @@ oam_print (netdissect_options *ndo,
     ND_TCHECK(*(p+ATM_HDR_LEN_NOHEC+hec));
     cell_header = EXTRACT_BE_32BITS(p + hec);
     cell_type = ((*(p+ATM_HDR_LEN_NOHEC+hec))>>4) & 0x0f;
-    func_type = (*(p+ATM_HDR_LEN_NOHEC+hec)) & 0x0f;
+    func_type = EXTRACT_8BITS((p + ATM_HDR_LEN_NOHEC + hec)) & 0x0f;
 
     vpi = (cell_header>>20)&0xff;
     vci = (cell_header>>4)&0xffff;

diff --git a/print-rrcp.c b/print-rrcp.c
index 23c5412d3942843aacb39c4ad821fce6839613b9..866e75b92486ba1019e9f31e110f7beaf2c89838 100644 (file)
--- a/print-rrcp.c
+++ b/print-rrcp.c
@@ -100,7 +100,7 @@ rrcp_print(netdissect_options *ndo,
        ND_TCHECK(*(cp + RRCP_PROTO_OFFSET));
        rrcp_proto = *(cp + RRCP_PROTO_OFFSET);
        ND_TCHECK(*(cp + RRCP_OPCODE_ISREPLY_OFFSET));
-       rrcp_opcode = (*(cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_OPCODE_MASK;
+       rrcp_opcode = EXTRACT_8BITS((cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_OPCODE_MASK;
        if (src != NULL && dst != NULL) {
                ND_PRINT((ndo, "%s > %s, ",
                        (src->addr_string)(ndo, src->addr),

diff --git a/smbutil.c b/smbutil.c
index 71ad60d9b491bee81f9b995f93c484eead8468e3..847979e40e98ac41d9af6abc80c1cd2e745f8423 100644 (file)
--- a/smbutil.c
+++ b/smbutil.c
@@ -133,7 +133,8 @@ name_interpret(netdissect_options *ndo,
     if (in >= maxbuf)
        return(-1);     /* name goes past the end of the buffer */
     ND_TCHECK2(*in, 1);
-    len = (*in++) / 2;
+    len = EXTRACT_8BITS(in) / 2;
+    in++;
 
     *out=0;