osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Guy Harris 2015-04-11 12:45:40 -07:00
parent 0394b01479
commit 9fecad775c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extcap/androiddump.c
View File

@ -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),