osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

From Yaniv Kaul: 

Fix 'set but not used' errors that GCC 4.6 emits.

svn path=/trunk/; revision=36895
This commit is contained in:
Anders Broman 2011-04-27 06:02:16 +00:00
parent 9c9585c9ea
commit 110e5961bb
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-cmpp.c
View File

@ -399,7 +399,7 @@ static void
cmpp_submit(proto_tree *tree, tvbuff_t *tvb)
{
int offset, i;
guint8 msg_format, destUsr, msgLen;
guint8 destUsr, msgLen;
offset = CMPP_FIX_HEADER_LENGTH;
cmpp_msg_id(tree, tvb, hf_cmpp_msg_id, offset);
offset += 8;
@ -423,7 +423,7 @@ cmpp_submit(proto_tree *tree, tvbuff_t *tvb)
offset++;
cmpp_uint1(tree, tvb, hf_cmpp_TP_udhi, offset);
offset++;
msg_format = cmpp_uint1(tree, tvb, hf_cmpp_Msg_Fmt, offset);
cmpp_uint1(tree, tvb, hf_cmpp_Msg_Fmt, offset);
offset++;
cmpp_octet_string(tree, tvb, hf_cmpp_submit_Msg_src, offset, 6);
offset += 6;

4
epan/dissectors/packet-componentstatus.c
View File

@ -153,7 +153,7 @@ dissect_componentstatusprotocol_componentstatusreport_message(tvbuff_t *message_
tvbuff_t *association_tvb;
proto_item *association_item;
proto_tree *association_tree;
gint associations;
/* gint associations; - variable set but not used, so commented out */
int i;
gint offset;
@ -163,7 +163,7 @@ dissect_componentstatusprotocol_componentstatusreport_message(tvbuff_t *message_
proto_tree_add_item(message_tree, hf_componentstatusreport_workload, message_tvb, COMPONENTSTATUSREPORT_WORKLOAD_OFFSET, COMPONENTSTATUSREPORT_WORKLOAD_LENGTH, FALSE);
proto_tree_add_item(message_tree, hf_componentstatusreport_associations, message_tvb, COMPONENTSTATUSREPORT_ASSOCIATIONS_OFFSET, COMPONENTSTATUSREPORT_ASSOCIATIONS_LENGTH, FALSE);
associations = tvb_get_ntohs(message_tvb, COMPONENTSTATUSREPORT_ASSOCIATIONS_OFFSET);
/* associations = tvb_get_ntohs(message_tvb, COMPONENTSTATUSREPORT_ASSOCIATIONS_OFFSET); */
offset = COMPONENTSTATUSREPORT_ASSOCIATIONARRAY_OFFSET;
i = 1;
while(tvb_reported_length_remaining(message_tvb, offset) >= COMPONENTASSOCIATION_LENGTH) {

5
epan/dissectors/packet-cpha.c
View File

@ -1,6 +1,6 @@
/* packet-cpha.c
* Routines for the Check Point High-Availability Protocol (CPHAP)
* Copyright 2002, Yaniv Kaul <ykaul-at-netvision.net.il>
* Copyright 2002, Yaniv Kaul <mykaul -at- gmail.com>
*
* $Id$
*
@ -293,7 +293,7 @@ dissect_cpha(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
static void dissect_my_state(tvbuff_t * tvb, int offset, proto_tree * tree) {
struct fwha_my_state_hdr hdr;
struct fwhap_if_state_s if_hdr;
int rep_mode, i;
int i;
proto_item * nti = NULL;
proto_tree * ntree = NULL;
@ -315,7 +315,6 @@ static void dissect_my_state(tvbuff_t * tvb, int offset, proto_tree * tree) {
proto_tree_add_uint_format_value(tree, hf_ha_time_unit, tvb, offset, sizeof(hdr.ha_time_unit), hdr.ha_time_unit, "%d milliseconds", hdr.ha_time_unit);
offset += sizeof(hdr.ha_time_unit);
rep_mode = is_report_ifs(hdr.report_code);
if (hdr.report_code & 1) {
/* states */
nti = proto_tree_add_text(tree, tvb, offset, hdr.id_num * sizeof(guint8), "Machine states");