forked from osmocom/wireshark
From Andrew Esh: fix a compiler warning.
svn path=/trunk/; revision=5491
This commit is contained in:
parent
1e85fff54b
commit
2ee99739c3
1
AUTHORS
1
AUTHORS
|
@ -1197,6 +1197,7 @@ Ruud Linders <ruud[AT]lucent.com> {
|
|||
Andrew Esh <Andrew.Esh[AT]tricord.com> {
|
||||
Support for interest level 1003 and 1007 in
|
||||
TRANS2_QUERY_FS_INFORMATION
|
||||
Fix a compiler warning
|
||||
}
|
||||
|
||||
Greg Morris <GMORRIS[AT]novell.com> {
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
* Routines for X11 dissection
|
||||
* Copyright 2000, Christophe Tronche <ch.tronche@computer.org>
|
||||
*
|
||||
* $Id: packet-x11.c,v 1.43 2002/04/23 06:06:03 guy Exp $
|
||||
* $Id: packet-x11.c,v 1.44 2002/05/16 19:29:03 guy Exp $
|
||||
*
|
||||
* Ethereal - Network traffic analyzer
|
||||
* By Gerald Combs <gerald@ethereal.com>
|
||||
|
@ -667,9 +667,9 @@ static const value_string zero_is_none_vals[] = {
|
|||
int bitmask_offset; \
|
||||
int bitmask_size; \
|
||||
proto_tree *bitmask_tree; \
|
||||
bitmask_value = ((size == 1) ? VALUE8(tvb, *offsetp) : \
|
||||
((size == 2) ? VALUE16(tvb, *offsetp) : \
|
||||
VALUE32(tvb, *offsetp))); \
|
||||
bitmask_value = ((size == 1) ? (guint32)VALUE8(tvb, *offsetp) : \
|
||||
((size == 2) ? (guint32)VALUE16(tvb, *offsetp) : \
|
||||
(guint32)VALUE32(tvb, *offsetp))); \
|
||||
bitmask_offset = *offsetp; \
|
||||
bitmask_size = size; \
|
||||
ti = proto_tree_add_uint(t, hf_x11_##name##_mask, tvb, *offsetp, size, bitmask_value); \
|
||||
|
|
Loading…
Reference in New Issue