diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2014-12-07 19:27:57 +0100 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2014-12-07 18:53:22 +0000 |
| commit | e456dec48be76ffd403bb6259537c441c0bac42e (patch) | |
| tree | 981d37c864ae8ffce8c9fe2dd068fea3c28999ce /epan/tvbuff_zlib.c | |
| parent | ade2beffeb29a1fe062ea0a571e10c120bc772eb (diff) | |
don't initialize variables if the first thing we do is assign a
different value to them
Change-Id: I719db9180b2ba5f21653086f2697ca9bac68d6b1
Reviewed-on: https://code.wireshark.org/review/5652
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
Diffstat (limited to 'epan/tvbuff_zlib.c')
| -rw-r--r-- | epan/tvbuff_zlib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/tvbuff_zlib.c b/epan/tvbuff_zlib.c index 3f359ba1ce..d586f5167b 100644 --- a/epan/tvbuff_zlib.c +++ b/epan/tvbuff_zlib.c @@ -47,17 +47,17 @@ tvbuff_t * tvb_uncompress(tvbuff_t *tvb, const int offset, int comprlen) { - gint err = Z_OK; + gint err; guint bytes_out = 0; - guint8 *compr = NULL; + guint8 *compr; guint8 *uncompr = NULL; tvbuff_t *uncompr_tvb = NULL; - z_streamp strm = NULL; - Bytef *strmbuf = NULL; + z_streamp strm; + Bytef *strmbuf; guint inits_done = 0; gint wbits = MAX_WBITS; - guint8 *next = NULL; - guint bufsiz = TVB_Z_MIN_BUFSIZ; + guint8 *next; + guint bufsiz; #ifdef TVB_Z_DEBUG guint inflate_passes = 0; guint bytes_in = tvb_length_remaining(tvb, offset); |