aboutsummaryrefslogtreecommitdiffstats
path: root/epan/compress
diff options
context:
space:
mode:
authorAndersBroman <anders.broman@ericsson.com>2014-10-30 17:40:20 +0100
committerAnders Broman <a.broman58@gmail.com>2014-10-30 16:42:46 +0000
commit066a3345702661e1e242f460af37fccff97f89be (patch)
tree469b11907ce5df41942bb2c603c09e1338e10758 /epan/compress
parente0a352631d0cde19df1cd085e263b0e9f05e361a (diff)
Add casts to try to please the OSX buildbot.
Change-Id: I66d546ef2dd276bf151b2956ccbe1f2b6c5cb2f5 Reviewed-on: https://code.wireshark.org/review/5002 Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/compress')
-rw-r--r--epan/compress/lzxpress.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/compress/lzxpress.c b/epan/compress/lzxpress.c
index 2e8883a407..d1d0b80f84 100644
--- a/epan/compress/lzxpress.c
+++ b/epan/compress/lzxpress.c
@@ -76,7 +76,7 @@ gssize lzxpress_decompress(const guint8 *input,
do {
if (indicator_bit == 0) {
indicator = PULL_LE_UINT32(input, input_index);
- input_index += sizeof(guint32);
+ input_index += (guint32)sizeof(guint32);
indicator_bit = 32;
}
indicator_bit--;
@@ -88,11 +88,11 @@ gssize lzxpress_decompress(const guint8 *input,
*/
if (((indicator >> indicator_bit) & 1) == 0) {
output[output_index] = input[input_index];
- input_index += sizeof(guint8);
- output_index += sizeof(guint8);
+ input_index += (guint32)sizeof(guint8);
+ output_index += (guint32)sizeof(guint8);
} else {
length = PULL_LE_UINT16(input, input_index);
- input_index += sizeof(guint16);
+ input_index += (guint32)sizeof(guint16);
offset = length / 8;
length = length % 8;
@@ -100,7 +100,7 @@ gssize lzxpress_decompress(const guint8 *input,
if (nibble_index == 0) {
nibble_index = input_index;
length = input[input_index] % 16;
- input_index += sizeof(guint8);
+ input_index += (guint32)sizeof(guint8);
} else {
length = input[nibble_index] / 16;
nibble_index = 0;
@@ -108,10 +108,10 @@ gssize lzxpress_decompress(const guint8 *input,
if (length == 15) {
length = input[input_index];
- input_index += sizeof(guint8);
+ input_index += (guint32)sizeof(guint8);
if (length == 255) {
length = PULL_LE_UINT16(input, input_index);
- input_index += sizeof(guint16);
+ input_index += (guint32)sizeof(guint16);
length -= (15 + 7);
}
length += 15;
@@ -126,8 +126,8 @@ gssize lzxpress_decompress(const guint8 *input,
output[output_index] = output[output_index - offset - 1];
- output_index += sizeof(guint8);
- length -= sizeof(guint8);
+ output_index += (guint32)sizeof(guint8);
+ length -= (guint32)sizeof(guint8);
} while (length != 0);
}
} while ((output_index < max_output_size) && (input_index < (input_size)));