osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Androiddump: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang 

Change-Id: I245ebb47dfc3d202cba5f63c33fca9c0e30da0ad
Reviewed-on: https://code.wireshark.org/review/7984
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
This commit is contained in:
Alexis La Goutte 2015-04-08 21:08:54 +02:00 committed by Michal Labedzki
parent 66f7f6eec8
commit d65f8961dc
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extcap/androiddump.c
View File

@ -1121,10 +1121,10 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
if (hex == 0x01) {
hex_data = new_hex_data;
hex = strtol(hex_data, &new_hex_data, 16);
strtol(hex_data, &new_hex_data, 16);
hex_data = new_hex_data;
hex = strtol(hex_data, &new_hex_data, 16);
strtol(hex_data, &new_hex_data, 16);
hex_data = new_hex_data;
hex = strtol(hex_data, &new_hex_data, 16);
@ -1132,7 +1132,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
raw_length = hex + 4;
} else if (hex == 0x04) {
hex_data = new_hex_data;
hex = strtol(hex_data, &new_hex_data, 16);
strtol(hex_data, &new_hex_data, 16);
hex_data = new_hex_data;
hex = strtol(hex_data, &new_hex_data, 16);
@ -1140,10 +1140,10 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
raw_length = hex +3;
} else if (hex == 0x02) {
hex_data = new_hex_data;
hex = strtol(hex_data, &new_hex_data, 16);
strtol(hex_data, &new_hex_data, 16);
hex_data = new_hex_data;
hex = strtol(hex_data, &new_hex_data, 16);
strtol(hex_data, &new_hex_data, 16);
hex_data = new_hex_data;
hex = strtol(hex_data, &new_hex_data, 16);
@ -1160,7 +1160,6 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
}
} else {
used_buffer_length += length;
length = 0;
break;
}
@ -1168,7 +1167,6 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
if (used_buffer_length + length < frame_length) {
used_buffer_length += length;
length = 0;
break;
}
@ -1185,7 +1183,7 @@ static int capture_android_bluetooth_hcidump(char *interface, char *fifo,
date.tm_year -= 1900;
ts = mktime(&date);
hex_data = new_hex_data = data + 29;
new_hex_data = data + 29;
}
captured_length = 0;