diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-04-11 12:45:40 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-04-11 19:46:23 +0000 |
| commit | 9fecad775ccb2c766fe9d6b19eb82ac7415361c9 (patch) | |
| tree | 4699c48d18bb81359a2873f20a72cf64ad034fde /extcap | |
| parent | 0394b01479fa71ed566d3a15540acae8b26cc945 (diff) | |
A temporary variable squelches some warnings.
GINT32_FROM_BE() and GINT32_TO_BE() both declare local variables, and
they collide, so warnings are issued if you use them both in the same
statement.
Change-Id: I87df6cf7f180316692ab5164e25263ff28d5d760
Reviewed-on: https://code.wireshark.org/review/8015
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'extcap')
| -rw-r--r-- | extcap/androiddump.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c index 91ca612d5e..f5cb7bba09 100644 --- a/extcap/androiddump.c +++ b/extcap/androiddump.c @@ -1555,10 +1555,13 @@ static int capture_android_bluetooth_btsnoop_net(char *interface, char *fifo, while (used_buffer_length >= 24 && used_buffer_length >= (int) (24 + GINT32_FROM_BE(*captured_length))) { + gint32 direction; + ts = GINT64_FROM_BE(*timestamp); ts -= BTSNOOP_TIMESTAMP_BASE; - h4_header->direction = GINT32_TO_BE(GINT32_FROM_BE(*flags) & 0x01); + direction = GINT32_FROM_BE(*flags) & 0x01; + h4_header->direction = GINT32_TO_BE(direction); extcap_dumper_dump(extcap_dumper, payload - sizeof(own_pcap_bluetooth_h4_header), GINT32_FROM_BE(*captured_length) + sizeof(own_pcap_bluetooth_h4_header), |