diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-03-17 09:11:21 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-03-17 09:11:21 +0000 |
| commit | 2e52e2ac997ca58caabee3270b5a6c3f96159ff0 (patch) | |
| tree | f91b54117a59dee1f23c74e86b53be24a21825bb /epan/dissectors/packet-edonkey.c | |
| parent | e8c305fd3b957b68388653ad1029a253c90b9a53 (diff) | |
[-Wmissing-prototypes]
Use explicit casts.
svn path=/trunk/; revision=48347
Diffstat (limited to 'epan/dissectors/packet-edonkey.c')
| -rw-r--r-- | epan/dissectors/packet-edonkey.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index 322290eec2..06887ec1f0 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -45,6 +45,8 @@ #include "packet-edonkey.h" #include "packet-tcp.h" +void proto_reg_handoff_edonkey(void); + static int proto_edonkey = -1; static int hf_edonkey_message = -1; @@ -1615,7 +1617,7 @@ static int dissect_edonkey_search_query(tvbuff_t *tvb, packet_info *pinfo _U_, /* <Search Query> ::= <Search Type> <Search> */ proto_item *ti; proto_tree *search_tree; - guint8 search_type, operator, special_tagtype, limit_type; + guint8 search_type, e_operator, special_tagtype, limit_type; guint16 tag_name_size, string_length; guint32 search_length, limit; int string_offset, tag_name_offset; @@ -1628,7 +1630,7 @@ static int dissect_edonkey_search_query(tvbuff_t *tvb, packet_info *pinfo _U_, case EDONKEY_SEARCH_BOOL: /* <Search> ::= <Operator> <Search Query> <Search Query> */ search_length += 1; - operator = tvb_get_guint8(tvb, offset+1); + e_operator = tvb_get_guint8(tvb, offset+1); /* Add subtree for search entry */ ti = proto_tree_add_item(tree, hf_edonkey_search, tvb, offset, search_length, ENC_NA); @@ -1636,7 +1638,7 @@ static int dissect_edonkey_search_query(tvbuff_t *tvb, packet_info *pinfo _U_, /* Add query info */ proto_tree_add_text(search_tree, tvb, offset, 2, "Boolean search (0x%02x): %s (0x%02x)", - search_type, val_to_str_const(operator, edonkey_search_ops, "Unknown"), operator); + search_type, val_to_str_const(e_operator, edonkey_search_ops, "Unknown"), e_operator); offset+=2; offset = dissect_edonkey_search_query(tvb, pinfo, offset, search_tree); |