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

kafka: fix -Wmissing-field-initializers by removing unneeded code 

LZ4F_decompress accepts a NULL parameter to apply default parameters, do
not bother setting a parameter (this also avoids
-Wmissing-field-initializers warnings from clang).

Change-Id: Id2cd8d58cd9339dd5af395092a8104b559b6e194
Reviewed-on: https://code.wireshark.org/review/21675
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Peter Wu 2017-05-16 01:07:06 +02:00 committed by Guy Harris
parent 4988cca14d
commit b56041627a
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-kafka.c
View File

@ -835,12 +835,10 @@ dissect_kafka_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int s
LZ4F_decompressionContext_t lz4_ctxt;
LZ4F_frameInfo_t lz4_info;
LZ4F_errorCode_t ret;
LZ4F_decompressOptions_t dec_opts;
size_t src_offset, src_size, dst_size;
guchar *decompressed_buffer = NULL;
/* Prepare compressed data buffer */
dec_opts.stableDst = 0;
guint compressed_size = tvb_reported_length(raw);
guint8 *data = (guint8*)tvb_memdup(wmem_packet_scope(), raw, 0, compressed_size);
/* Override header checksum to workaround buggy Kafka implementations */
@ -893,7 +891,7 @@ dissect_kafka_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int s
/* Attempt the decompression. */
src_size = compressed_size - src_offset;
ret = LZ4F_decompress(lz4_ctxt, decompressed_buffer, &dst_size,
&data[src_offset], &src_size, &dec_opts);
&data[src_offset], &src_size, NULL);
LZ4F_freeDecompressionContext(lz4_ctxt);
if (ret == 0) {
size_t uncompressed_size = dst_size;