diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2004-12-25 10:30:58 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2004-12-25 10:30:58 +0000 |
| commit | e8459f4ea1a08f7b661d8717db1a9b8125860142 (patch) | |
| tree | 8de278443323de72b9cb2a34386b12a5e4da8b0d /epan | |
| parent | dc0fc1896e6fd6760ce052ed522a5ae010b211ce (diff) | |
| download | wireshark-e8459f4ea1a08f7b661d8717db1a9b8125860142.tar.gz wireshark-e8459f4ea1a08f7b661d8717db1a9b8125860142.tar.bz2 wireshark-e8459f4ea1a08f7b661d8717db1a9b8125860142.zip | |
Again, some warnings removed.
svn path=/trunk/; revision=12831
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-bssgp.c | 8 | ||||
| -rw-r--r-- | epan/dissectors/packet-dhcpv6.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-windows-common.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c index 2c1763a8cb..db64740095 100644 --- a/epan/dissectors/packet-bssgp.c +++ b/epan/dissectors/packet-bssgp.c @@ -487,13 +487,13 @@ get_byte_offset(guint64 bo) { static guint32 get_start_octet(guint64 bo) { - return floor((gint64)bo / 8.0); + return (guint32) floor((gint64)bo / 8.0); } static guint32 get_end_octet(guint64 bo, guint32 bl) { - return ceil((gint64)(bo + bl) / 8.0); + return (guint32) ceil((gint64)(bo + bl) / 8.0); } static guint32 @@ -2208,7 +2208,7 @@ decode_msrac_access_capabilities(proto_tree *tree, tvbuff_t *tvb, } } proto_item_set_len(ti, get_num_octets_spanned(start_bo, - bo - start_bo)); + (guint32) (bo - start_bo))); } else { pi = bit_proto_tree_add_bit_field8(tree, tvb, bo, bl); @@ -2805,7 +2805,7 @@ decode_iei_lsa_information(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offset proto_item *ti, *ti2, *pi; proto_tree *tf, *tf2; int num_lsa_infos, i; - guint32 data, value; + guint8 data, value; value_string tab_priority[] = { { 0, "Priority 1 = lowest priority" }, diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c index f00d0c5c45..1b9d7f8b7d 100644 --- a/epan/dissectors/packet-dhcpv6.c +++ b/epan/dissectors/packet-dhcpv6.c @@ -710,7 +710,7 @@ dhcpv6_option(tvbuff_t *tvb, proto_tree *bp_tree, int off, int eoff, /* proto_tree_add_text(subtree, tvb, off, 1, */ /* "flags: %d", */ /* (guint32)tvb_get_guint8(tvb, off)); */ - dhcpv6_domain(subtree,tvb, off+1, optlen-1); + dhcpv6_domain(subtree,tvb, off+1, (guint16) (optlen-1)); break; case OPTION_IAPREFIX: diff --git a/epan/dissectors/packet-windows-common.c b/epan/dissectors/packet-windows-common.c index c46cf1e2ef..8934c0bb37 100644 --- a/epan/dissectors/packet-windows-common.c +++ b/epan/dissectors/packet-windows-common.c @@ -1824,7 +1824,7 @@ dissect_nt_acl(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree = NULL; int old_offset = offset; int pre_ace_offset; - guint8 revision; + guint16 revision; guint32 num_aces; if(parent_tree){ |