Wireshark-commits: [Wireshark-commits] master abbf520: Squelch some warnings:

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 16 Apr 2014 00:41:43 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=abbf5202b46fe6cb57e30fbc5fb8afee1157a4de
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

abbf520 by Guy Harris (guy@xxxxxxxxxxxx):

    Squelch some warnings:
    
    The dictionary_id member of a spdy_conv_t is only used if we have libz;
    put it inside the #ifdef.  That also lets us give it a type of uLong,
    from libz, which avoids it being 32 bits when the type returned by
    adler32() is 64 bits.  (The *value returned by adler32()* might always
    fit in 32 bits, but this is arguably cleaner than throwing a cast at the
    problem.)
    
    The third argument to adler32() is a uInt; cast sizeof to uInt to avoid
    other 32-bit-vs-64-bit warnings.  (It should have been size_t, but maybe
    libz antedated size_t's availability in all the compilers that were used
    to compile it.)
    
    The buffer size in spdy_decompress_header_block() is always 16K; just
    make it a #define that is *not* size_t, so that we avoid other
    32-bit-vs-64-bit warnings.
    
    Use DISSECTOR_ASSERT_NOT_REACHED() for "this can't happen" - it's marked
    as "doesn't return", so we don't get "variable is unassigned" warnings
    (at least not from the Clang I'm using), and also means we wouldn't get
    a crash if it *does* happen (we just get a warning on the console and in
    the protocol tree).
    
    Change-Id: I55945b69b7485a02f3f623b21f671ed2915d453d
    Reviewed-on: https://code.wireshark.org/review/1162
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  cd958c7   Squelch warnings when built without libz.
    adds  abbf520   Squelch some warnings:


Summary of changes:
 epan/dissectors/packet-spdy.c |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)