diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-02-19 21:27:03 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-02-20 05:27:38 +0000 |
| commit | dc6b9dfcd635a1ca97a218bcdaf16a2ee5f7b693 (patch) | |
| tree | 49ce29aca0c5cce7f14b06b7bd89d7a1a35614b4 /epan/dissectors/packet-iso14443.c | |
| parent | e4787a9190c82dadae7e57c0847e2529bb2a9bbf (diff) | |
Define macros to calculate (2^N)^M, and use them in more places.
Change-Id: I4df1b35d8d2233c301f0ba9e119d012aebe9cd17
Reviewed-on: https://code.wireshark.org/review/25913
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-iso14443.c')
| -rw-r--r-- | epan/dissectors/packet-iso14443.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-iso14443.c b/epan/dissectors/packet-iso14443.c index 76050832c9..4e2b3e5536 100644 --- a/epan/dissectors/packet-iso14443.c +++ b/epan/dissectors/packet-iso14443.c @@ -25,15 +25,16 @@ #include "config.h" -#include <math.h> #include <epan/packet.h> #include <epan/expert.h> #include <epan/conversation.h> #include <epan/tfs.h> #include <epan/reassemble.h> -#include <wiretap/wtap.h> #include <epan/crc16-tvb.h> +#include <wiretap/wtap.h> + +#include <wsutil/pow2.h> /* Proximity Integrated Circuit Card, i.e. the smartcard */ #define ADDR_PICC "PICC" @@ -541,8 +542,8 @@ dissect_iso14443_cmd_type_wupb(tvbuff_t *tvb, packet_info *pinfo, col_set_str(pinfo->cinfo, COL_INFO, msg_type); proto_item_append_text(ti, ": %s", msg_type); proto_tree_add_uint_bits_format_value(tree, hf_iso14443_n, - tvb, offset*8+5, 3, (guint8)pow(2, param&0x07), - "%d", (guint8)pow(2, param&0x07)); + tvb, offset*8+5, 3, pow2(guint32, param&0x07), + "%u", pow2(guint32, param&0x07)); offset++; if (!crc_dropped) { |