diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-04-11 13:40:40 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-04-11 20:41:07 +0000 |
| commit | afec93cb79f7edafac505491416560c1604164ca (patch) | |
| tree | 4bfa997751aeb27e9e53ff06eeacb0f799b568c5 /extcap | |
| parent | 08c083a930deec36cd0460fbaf13969f6d17f7d8 (diff) | |
| download | wireshark-afec93cb79f7edafac505491416560c1604164ca.tar.gz wireshark-afec93cb79f7edafac505491416560c1604164ca.tar.bz2 wireshark-afec93cb79f7edafac505491416560c1604164ca.zip | |
More type cleanup to squelch warnings.
Make exported_pdu_headers_size a size_t to make it big enough. Make
used_buffer_length a size_t as it doesn't go negative and gets compared
with unsigned values. Cast length to size_t when comparing it with
used_buffer_length - by that time, we've ensured that it's not negative.
Change-Id: Ie192eee55914ebe548865d46575768964353ea2d
Reviewed-on: https://code.wireshark.org/review/8021
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'extcap')
| -rw-r--r-- | extcap/androiddump.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extcap/androiddump.c b/extcap/androiddump.c index b1fb02b7ef..17e6346e62 100644 --- a/extcap/androiddump.c +++ b/extcap/androiddump.c @@ -1750,10 +1750,10 @@ static int capture_android_logcat(char *interface, char *fifo, static char packet[PACKET_LENGTH]; static char helper_packet[PACKET_LENGTH]; ssize_t length; - ssize_t used_buffer_length = 0; + size_t used_buffer_length = 0; int sock; const char *protocol_name; - int exported_pdu_headers_size = 0; + size_t exported_pdu_headers_size = 0; struct exported_pdu_header exported_pdu_header_protocol_events; struct exported_pdu_header exported_pdu_header_protocol_normal; struct exported_pdu_header *exported_pdu_header_protocol; @@ -1923,7 +1923,7 @@ static int capture_android_logcat(char *interface, char *fifo, length = (*payload_length) + header_size + exported_pdu_headers_size; - while (used_buffer_length >= exported_pdu_headers_size + header_size && length <= used_buffer_length) { + while (used_buffer_length >= exported_pdu_headers_size + header_size && (size_t)length <= used_buffer_length) { extcap_dumper_dump(extcap_dumper, packet, length, length, |