diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-04-01 01:32:56 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2016-04-04 06:58:41 +0000 |
commit | 6f98a0fac33db70b3ceb71d939b0a9d0d47747cc (patch) | |
tree | f4769e5888fca9bd30cde35aabad4542849e9c4f /epan/dissectors | |
parent | e005bc819c201c49cf330a2607ad0770f145904e (diff) |
Rename "libz" to "zlib"
Change-Id: I12f92c983d587c2a4751428cdf299635090c9f0b
Reviewed-on: https://code.wireshark.org/review/14748
Reviewed-by: João Valverde <j@v6e.pt>
Petri-Dish: João Valverde <j@v6e.pt>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-gadu-gadu.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-http.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-ldss.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-slsk.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-spdy.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-spice.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ssl-utils.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-vnc.c | 8 |
8 files changed, 25 insertions, 25 deletions
diff --git a/epan/dissectors/packet-gadu-gadu.c b/epan/dissectors/packet-gadu-gadu.c index e2f594fde9..5aeb2ec7a1 100644 --- a/epan/dissectors/packet-gadu-gadu.c +++ b/epan/dissectors/packet-gadu-gadu.c @@ -1447,7 +1447,7 @@ dissect_gadu_gadu_userlist_xml_compressed(tvbuff_t *tvb, packet_info *pinfo, pro /* XXX add DTD (pinfo->match_string) */ call_dissector_only(xml_handle, uncomp_tvb, pinfo, tree, NULL); } else - proto_tree_add_bytes_format_value(tree, hfi_gadu_gadu_userlist.id, tvb, offset, remain, NULL, "[Error: Decompression failed] (or no libz)"); + proto_tree_add_bytes_format_value(tree, hfi_gadu_gadu_userlist.id, tvb, offset, remain, NULL, "[Error: Decompression failed] (or no zlib)"); offset += remain; diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 77af766c98..1caf49f63b 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -256,7 +256,7 @@ static gboolean http_dechunk_body = TRUE; /* * Decompression of zlib encoded entities. */ -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB static gboolean http_decompress_body = TRUE; #else static gboolean http_decompress_body = FALSE; @@ -3456,7 +3456,7 @@ proto_register_http(void) "Whether to reassemble bodies of entities that are transferred " "using the \"Transfer-Encoding: chunked\" method", &http_dechunk_body); -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB prefs_register_bool_preference(http_module, "decompress_body", "Uncompress entity bodies", "Whether to uncompress entity bodies that are compressed " diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c index ba5ebfccf3..e30354d40b 100644 --- a/epan/dissectors/packet-ldss.c +++ b/epan/dissectors/packet-ldss.c @@ -685,7 +685,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void ? "Gzip compressed data: %d bytes" : "File data: %d bytes", tvb_captured_length(tvb)); -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB /* Be nice and uncompress the file data. */ if (compression == COMPRESSION_GZIP) { tvbuff_t *uncomp_tvb; diff --git a/epan/dissectors/packet-slsk.c b/epan/dissectors/packet-slsk.c index 583fc57c54..0ccba62fb6 100644 --- a/epan/dissectors/packet-slsk.c +++ b/epan/dissectors/packet-slsk.c @@ -121,7 +121,7 @@ static expert_field ei_slsk_zlib_decompression_failed = EI_INIT; /* desegmentation of SoulSeek Message over TCP */ static gboolean slsk_desegment = TRUE; -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB static gboolean slsk_decompress = TRUE; #else static gboolean slsk_decompress = FALSE; @@ -2616,7 +2616,7 @@ proto_register_slsk(void) "Whether the SoulSeek dissector should reassemble messages spanning multiple TCP segments." " To use this option, you must also enable \"Allow subdissectors to reassemble TCP streams\" in the TCP protocol settings.", &slsk_desegment); -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB prefs_register_bool_preference(slsk_module, "decompress", "Decompress zlib compressed packets inside SoulSeek messages", "Whether the SoulSeek dissector should decompress all zlib compressed packets inside messages", diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c index 44ad165661..19640100ba 100644 --- a/epan/dissectors/packet-spdy.c +++ b/epan/dissectors/packet-spdy.c @@ -41,7 +41,7 @@ #include "packet-tcp.h" #include "packet-ssl.h" -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB #define ZLIB_CONST #include <zlib.h> #endif @@ -58,7 +58,7 @@ void proto_reg_handoff_spdy(void); * entities and for decompressing request & reply header blocks. */ typedef struct _spdy_conv_t { -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB z_streamp rqst_decompressor; z_streamp rply_decompressor; uLong dictionary_id; @@ -248,7 +248,7 @@ static gboolean spdy_assemble_entity_bodies = TRUE; /* * Decompression of zlib encoded entities. */ -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB static gboolean spdy_decompress_body = TRUE; static gboolean spdy_decompress_headers = TRUE; #else @@ -437,7 +437,7 @@ static const char spdy_dictionary[] = { 0x2c, 0x65, 0x6e, 0x71, 0x3d, 0x30, 0x2e /* - e n q - 0 - */ }; -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB /* callback function used at the end of file-scope to cleanup zlib's inflate * streams to avoid memory leaks. * XXX: can we be more aggressive and call this sooner for finished streams? @@ -467,7 +467,7 @@ spdy_init_protocol(void) static spdy_conv_t * get_or_create_spdy_conversation_data(packet_info *pinfo) { conversation_t *conversation; spdy_conv_t *conv_data; -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB int retcode; #endif @@ -481,7 +481,7 @@ static spdy_conv_t * get_or_create_spdy_conversation_data(packet_info *pinfo) { conv_data->streams = NULL; if (spdy_decompress_headers) { -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB conv_data->rqst_decompressor = wmem_new0(wmem_file_scope(), z_stream); conv_data->rply_decompressor = wmem_new0(wmem_file_scope(), z_stream); retcode = inflateInit(conv_data->rqst_decompressor); @@ -942,7 +942,7 @@ body_dissected: return frame->length; } -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB /* * Performs header decompression. * @@ -1153,7 +1153,7 @@ static int dissect_spdy_header_payload( if (header_info == NULL) { guint8 *uncomp_ptr = NULL; guint uncomp_length = 0; -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB z_streamp decomp; /* Get our decompressor. */ diff --git a/epan/dissectors/packet-spice.c b/epan/dissectors/packet-spice.c index 72b6497ab7..4c9d96432e 100644 --- a/epan/dissectors/packet-spice.c +++ b/epan/dissectors/packet-spice.c @@ -1197,7 +1197,7 @@ dissect_ImageJPEG(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, const gui return JPEG_Size + 4; } -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB static void dissect_ImageZLIB_GLZ_stream(tvbuff_t *tvb, proto_tree *ZLIB_GLZ_tree, packet_info *pinfo, guint32 offset, guint32 ZLIB_GLZSize, guint32 ZLIB_uncompSize) diff --git a/epan/dissectors/packet-ssl-utils.c b/epan/dissectors/packet-ssl-utils.c index ac77c8203c..b534144eac 100644 --- a/epan/dissectors/packet-ssl-utils.c +++ b/epan/dissectors/packet-ssl-utils.c @@ -26,7 +26,7 @@ #include "config.h" -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB #define ZLIB_CONST #include <zlib.h> #endif @@ -1233,7 +1233,7 @@ static const ssl_alpn_protocol_t ssl_alpn_protocols[] = { */ struct _SslDecompress { gint compression; -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB z_stream istream; #endif }; @@ -2613,7 +2613,7 @@ ssl_decrypt_record(SslDecryptSession*ssl, SslDecoder* decoder, gint ct, #ifdef HAVE_LIBGCRYPT /* Record Decompression (after decryption) {{{ */ -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB /* memory allocation functions for zlib initialization */ static void* ssl_zalloc(void* opaque _U_, unsigned int no, unsigned int size) { @@ -2629,7 +2629,7 @@ static SslDecompress* ssl_create_decompressor(gint compression) { SslDecompress *decomp; -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB int err; #endif @@ -2638,7 +2638,7 @@ ssl_create_decompressor(gint compression) decomp = (SslDecompress *)wmem_alloc(wmem_file_scope(), sizeof(SslDecompress)); decomp->compression = compression; switch (decomp->compression) { -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB case 1: /* DEFLATE */ decomp->istream.zalloc = ssl_zalloc; decomp->istream.zfree = ssl_zfree; @@ -2661,7 +2661,7 @@ ssl_create_decompressor(gint compression) return decomp; } -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB static int ssl_decompress_record(SslDecompress* decomp, const guchar* in, guint inl, StringInfo* out_str, guint* outl) { diff --git a/epan/dissectors/packet-vnc.c b/epan/dissectors/packet-vnc.c index 73e0b91c98..a5c8480b58 100644 --- a/epan/dissectors/packet-vnc.c +++ b/epan/dissectors/packet-vnc.c @@ -2938,7 +2938,7 @@ vnc_h264_encoding(tvbuff_t *tvb, gint *offset, proto_tree *tree) return 0; /* bytes_needed */ } -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB static guint vnc_zrle_encoding(tvbuff_t *tvb, packet_info *pinfo, gint *offset, proto_tree *tree, const guint16 width, const guint16 height) @@ -2949,7 +2949,7 @@ vnc_zrle_encoding(tvbuff_t *tvb, packet_info *pinfo _U_, gint *offset, #endif { guint32 data_len; -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB guint8 palette_size; guint8 bytes_per_cpixel = vnc_get_bytes_per_pixel(pinfo); gint uncomp_offset = 0; @@ -2972,7 +2972,7 @@ vnc_zrle_encoding(tvbuff_t *tvb, packet_info *pinfo _U_, gint *offset, proto_tree_add_item(tree, hf_vnc_zrle_data, tvb, *offset, data_len, ENC_NA); -#ifdef HAVE_LIBZ +#ifdef HAVE_ZLIB uncomp_tvb = tvb_child_uncompress(tvb, tvb, *offset, data_len); if(uncomp_tvb != NULL) { @@ -3020,7 +3020,7 @@ vnc_zrle_encoding(tvbuff_t *tvb, packet_info *pinfo _U_, gint *offset, } else { proto_tree_add_expert(tree, pinfo, &ei_vnc_zrle_failed, tvb, *offset, data_len); } -#endif /* HAVE_LIBZ */ +#endif /* HAVE_ZLIB */ *offset += data_len; |