diff options
author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-07-13 18:42:40 +0000 |
---|---|---|
committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-07-13 18:42:40 +0000 |
commit | 5c53a497d14a3b0f5a157770939de0d9bfe696be (patch) | |
tree | 433a6eb8911cef2d93938b13bc94698f95645dd3 /epan/dissectors | |
parent | 9e5877e7411df6dae09ce2c3a381b678d31c0e6a (diff) |
Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37999 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-dcerpc-spoolss.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-edonkey.c | 18 | ||||
-rw-r--r-- | epan/dissectors/packet-giop.c | 50 |
3 files changed, 35 insertions, 41 deletions
diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c index bc78b5abc1..fed38809be 100644 --- a/epan/dissectors/packet-dcerpc-spoolss.c +++ b/epan/dissectors/packet-dcerpc-spoolss.c @@ -1757,7 +1757,7 @@ dissect_spoolss_relstrarray(tvbuff_t *tvb, int offset, packet_info *pinfo, { proto_item *item; proto_tree *subtree; - guint32 relstr_offset, relstr_start, relstr_end, relstr_len; + guint32 relstr_offset, relstr_start/*, relstr_end, relstr_len*/; char *text; item = proto_tree_add_string(tree, hf_index, tvb, offset, 4, ""); @@ -1772,14 +1772,14 @@ dissect_spoolss_relstrarray(tvbuff_t *tvb, int offset, packet_info *pinfo, relstr_start = relstr_offset + struct_start; if (relstr_offset) - relstr_end = dissect_spoolss_uint16uni( + /*relstr_end = */dissect_spoolss_uint16uni( tvb, relstr_start, pinfo, subtree, drep, &text, NULL); else { text = g_strdup("NULL"); - relstr_end = offset; + /*relstr_end = offset;*/ } - relstr_len = relstr_end - relstr_start; + /*relstr_len = relstr_end - relstr_start;*/ proto_item_append_text(item, "%s", text); diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index b484dcfafd..87347ccef6 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -1724,7 +1724,7 @@ static void dissect_edonkey_tcp_message(guint8 msg_type, tvbuff_t *tvb, packet_info *pinfo _U_, int offset, int length, proto_tree *tree) { - int msg_start, msg_end, bytes_remaining; + int msg_end, bytes_remaining; guint8 helloClient, more; guint32 nusers, nfiles; @@ -1734,7 +1734,6 @@ static void dissect_edonkey_tcp_message(guint8 msg_type, if ((length < 0) || (length > bytes_remaining)) length = bytes_remaining; if (length <= 0) return; - msg_start = offset; msg_end = offset + length; switch (msg_type) { @@ -1924,7 +1923,7 @@ static void dissect_emule_tcp_message(guint8 msg_type, tvbuff_t *tvb, packet_info *pinfo _U_, int offset, int length, proto_tree *tree) { - int msg_start, msg_end, bytes_remaining; + int msg_end, bytes_remaining; guint32 packed_length; guint16 version, rank, partnum; @@ -1934,7 +1933,6 @@ static void dissect_emule_tcp_message(guint8 msg_type, if ((length < 0) || (length > bytes_remaining)) length = bytes_remaining; if (length <= 0) return; - msg_start = offset; msg_end = offset + length; switch (msg_type) { @@ -2081,7 +2079,7 @@ static int dissect_edonkey_udp_message(guint8 msg_type, tvbuff_t *tvb, packet_info *pinfo _U_, int offset, int length, proto_tree *tree) { - int msg_start, msg_end, bytes_remaining; + int msg_end, bytes_remaining; guint8 type; guint16 min, max; guint16 ischal; @@ -2094,7 +2092,6 @@ static int dissect_edonkey_udp_message(guint8 msg_type, if ((length < 0) || (length > bytes_remaining)) length = bytes_remaining; if (length <= 0) return offset; - msg_start = offset; msg_end = offset + length; switch (msg_type) { @@ -2263,14 +2260,13 @@ static int dissect_emule_udp_message(guint8 msg_type, tvbuff_t *tvb, packet_info *pinfo _U_, int offset, int length, proto_tree *tree) { - int msg_start, msg_end, bytes_remaining; + int msg_end, bytes_remaining; guint16 rank; bytes_remaining = tvb_reported_length_remaining(tvb, offset); if ((length < 0) || (length > bytes_remaining)) length = bytes_remaining; if (length <= 0) return offset; - msg_start = offset; msg_end = offset + length; switch (msg_type) { @@ -2630,7 +2626,7 @@ static int dissect_kademlia_udp_message(guint8 msg_type, tvbuff_t *tvb, packet_info *pinfo _U_, int offset, int length, proto_tree *tree) { - int msg_start, msg_end, bytes_remaining; + int msg_end, bytes_remaining; proto_item *hidden_item; bytes_remaining = tvb_reported_length_remaining(tvb, offset); @@ -2640,7 +2636,6 @@ static int dissect_kademlia_udp_message(guint8 msg_type, hidden_item = proto_tree_add_item(tree, hf_kademlia, tvb, offset, 1, FALSE); PROTO_ITEM_SET_HIDDEN(hidden_item); - msg_start = offset; msg_end = offset + length; switch (msg_type) { @@ -2945,7 +2940,7 @@ static void dissect_edonkey_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tre { proto_item *ti; proto_tree *edonkey_tree = NULL, *edonkey_msg_tree = NULL, *emule_zlib_tree = NULL; - int offset, bytes, messages; + int offset, bytes; guint8 protocol, msg_type; guint32 msg_len; const gchar *protocol_name, *message_name; @@ -2960,7 +2955,6 @@ static void dissect_edonkey_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tre } offset = 0; - messages = 0; protocol = tvb_get_guint8(tvb, offset); msg_len = tvb_get_letohl(tvb, offset+1); diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 54ef4d52f4..72ef8ff64a 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -5405,10 +5405,10 @@ static void dissect_tk_objref_params(tvbuff_t *tvb, proto_tree *tree, gint *offs guint32 new_boundary; /* new boundary for encapsulation */ gboolean new_stream_is_big_endian; /* new endianness for encapsulation */ - guint32 seqlen; /* sequence length */ + /*guint32 seqlen;*/ /* sequence length */ /* get sequence length, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + /*seqlen = */get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -5431,11 +5431,11 @@ static void dissect_tk_struct_params(tvbuff_t *tvb, proto_tree *tree, gint *offs gboolean new_stream_is_big_endian; /* new endianness for encapsulation */ guint32 count; /* parameter count (of tuples) */ - guint32 seqlen; /* sequence length */ + /*guint32 seqlen;*/ /* sequence length */ guint32 i; /* loop index */ - /* get sequence lengt,h new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + /* get sequence length new endianness and boundary for encapsulation */ + /*seqlen = */get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -5478,11 +5478,11 @@ static void dissect_tk_union_params(tvbuff_t *tvb, proto_tree *tree, gint *offse gint32 s_octet4; /* signed int32 */ guint32 count; /* parameter count (of tuples) */ - guint32 seqlen; /* sequence length */ + /*guint32 seqlen;*/ /* sequence length */ guint32 i; /* loop index */ /* get sequence legnth, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + /*seqlen = */get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -5533,11 +5533,11 @@ static void dissect_tk_enum_params(tvbuff_t *tvb, proto_tree *tree, gint *offset gboolean new_stream_is_big_endian; /* new endianness for encapsulation */ guint32 count; /* parameter count (of tuples) */ - guint32 seqlen; /* sequence length */ + /*guint32 seqlen;*/ /* sequence length */ guint32 i; /* loop index */ /* get sequence length, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + /*seqlen = */get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -5575,10 +5575,10 @@ static void dissect_tk_sequence_params(tvbuff_t *tvb, proto_tree *tree, gint *of guint32 u_octet4; /* unsigned int32 */ - guint32 seqlen; /* sequence length */ + /*guint32 seqlen;*/ /* sequence length */ /* get sequence length, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + /*seqlen = */get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -5603,10 +5603,10 @@ static void dissect_tk_array_params(tvbuff_t *tvb, proto_tree *tree, gint *offse guint32 u_octet4; /* unsigned int32 */ - guint32 seqlen; /* sequence length */ + /*guint32 seqlen;*/ /* sequence length */ /* get sequence length, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + /*seqlen = */get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -5629,10 +5629,10 @@ static void dissect_tk_alias_params(tvbuff_t *tvb, proto_tree *tree, gint *offse guint32 new_boundary; /* new boundary for encapsulation */ gboolean new_stream_is_big_endian; /* new endianness for encapsulation */ - guint32 seqlen; /* sequence length */ + /*guint32 seqlen;*/ /* sequence length */ /* get sequence legnth, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + /*seqlen = */get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -5658,11 +5658,11 @@ static void dissect_tk_except_params(tvbuff_t *tvb, proto_tree *tree, gint *offs gboolean new_stream_is_big_endian; /* new endianness for encapsulation */ guint32 count; /* parameter count (of tuples) */ - guint32 seqlen; /* sequence length */ + /*guint32 seqlen;*/ /* sequence length */ guint32 i; /* loop index */ /* get sequence length, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + /*seqlen = */get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -5704,11 +5704,11 @@ static void dissect_tk_value_params(tvbuff_t *tvb, proto_tree *tree, gint *offse gint16 s_octet2; /* signed int16 */ guint32 count; /* parameter count (of tuples) */ - guint32 seqlen; /* sequence length */ + /*guint32 seqlen;*/ /* sequence length */ guint32 i; /* loop index */ /* get sequence length, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + /*seqlen = */get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -5764,10 +5764,10 @@ static void dissect_tk_value_box_params(tvbuff_t *tvb, proto_tree *tree, gint *o guint32 new_boundary; /* new boundary for encapsulation */ gboolean new_stream_is_big_endian; /* new endianness for encapsulation */ - guint32 seqlen; /* sequence length */ + /*guint32 seqlen;*/ /* sequence length */ /* get sequence length, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + /*seqlen = */get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -5790,10 +5790,10 @@ static void dissect_tk_native_params(tvbuff_t *tvb, proto_tree *tree, gint *offs guint32 new_boundary; /* new boundary for encapsulation */ gboolean new_stream_is_big_endian; /* new endianness for encapsulation */ - guint32 seqlen; /* sequence length */ + /*guint32 seqlen;*/ /* sequence length */ /* get sequence length, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + /*seqlen = */get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); @@ -5814,10 +5814,10 @@ static void dissect_tk_abstract_interface_params(tvbuff_t *tvb, proto_tree *tree guint32 new_boundary; /* new boundary for encapsulation */ gboolean new_stream_is_big_endian; /* new endianness for encapsulation */ - guint32 seqlen; /* sequence length */ + /*guint32 seqlen;*/ /* sequence length */ /* get sequence length, new endianness and boundary for encapsulation */ - seqlen = get_CDR_encap_info(tvb, tree, offset, + /*seqlen = */get_CDR_encap_info(tvb, tree, offset, stream_is_big_endian, boundary, &new_stream_is_big_endian, &new_boundary); |