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/packet-spdy.c | |
| 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/packet-spdy.c')
| -rw-r--r-- | epan/dissectors/packet-spdy.c | 16 |
1 files changed, 8 insertions, 8 deletions
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. */ |