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

Fix some set but not used [-Wunused-but-set-variable] warnings. 

svn path=/trunk/; revision=39579
This commit is contained in:
Anders Broman 2011-10-25 20:08:26 +00:00
parent 54e47c8285
commit ae8165fd4c
5 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/packet-eigrp.c
View File

@ -651,7 +651,7 @@ dissect_eigrp_parameter (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo,
proto_item *ti)
{
int offset = 0;
guint8 k1, k2, k3, k4, k5, k6;
guint8 k1, k2, k3, k4, k5;
k1 = tvb_get_guint8(tvb, offset);
proto_tree_add_item(tree, hf_eigrp_par_k1, tvb, offset, 1, ENC_BIG_ENDIAN);
@ -673,7 +673,6 @@ dissect_eigrp_parameter (proto_tree *tree, tvbuff_t *tvb, packet_info *pinfo,
proto_tree_add_item(tree, hf_eigrp_par_k5, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
k6 = tvb_get_guint8(tvb, offset);
proto_tree_add_item(tree, hf_eigrp_par_k6, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;

3
epan/dissectors/packet-gsm_a_common.c
View File

@ -2263,15 +2263,12 @@ de_mid(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, guint32 offset, guin
guint16
de_ms_cm_1(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo _U_, guint32 offset, guint len _U_, gchar *add_string _U_, int string_len _U_)
{
guint8 oct;
guint32 curr_offset;
proto_tree *subtree;
proto_item *item;
curr_offset = offset;
oct = tvb_get_guint8(tvb, curr_offset);
item =
proto_tree_add_text(tree,
tvb, curr_offset, 1, "%s",

2
epan/dissectors/packet-ipdc.c
View File

@ -734,7 +734,6 @@ dissect_ipdc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
gshort ns = tvb_get_guint8(tvb,1);
guint payload_len = get_ipdc_pdu_len(pinfo,tvb,0);
gshort protocol_id;
gshort trans_id_size;
guint32 trans_id;
guint16 message_code;
@ -772,7 +771,6 @@ dissect_ipdc_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
}
/* IPDC tags present - display message code and trans. ID */
protocol_id = tvb_get_guint8(tvb,4);
trans_id_size = TRANS_ID_SIZE_IPDC; /* tvb_get_guint8(tvb,5); */
trans_id = tvb_get_ntohl(tvb,6);
message_code = tvb_get_ntohs(tvb,6+trans_id_size);

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

@ -536,13 +536,12 @@ iscsi_dissect_TargetAddress(packet_info *pinfo, proto_tree *tree _U_,char *val)
address *addr = NULL;
int port;
char *value = ep_strdup(val);
char *a = NULL, *p = NULL, *pgt = NULL;
char *p = NULL, *pgt = NULL;
if (value[0] == '[') {
/* this looks like an ipv6 address */
p = strchr(value, ']');
if (p != NULL) {
a = value+1;
*p = 0;
p += 2; /* skip past "]:" */
@ -560,7 +559,6 @@ iscsi_dissect_TargetAddress(packet_info *pinfo, proto_tree *tree _U_,char *val)
/* looks like a ipv4 address */
p = strchr(value, ':');
if (p != NULL) {
a = value;
*p++ = 0;
pgt = strchr(p, ',');

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

@ -2328,7 +2328,6 @@ dissect_v9_pdu_scope(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *pdutree,
struct v9_v10_template *tplt)
{
int orig_offset;
proto_item *ti;
int i;
DISSECTOR_ASSERT(tplt->fields[TF_SCOPES] != NULL);
@ -2345,11 +2344,11 @@ dissect_v9_pdu_scope(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *pdutree,
switch (type) {
/* XXX: template length fields should be validated during template processing ... */
case 1: /* system */
ti = proto_tree_add_item(pdutree, hf_cflow_scope_system,
proto_tree_add_item(pdutree, hf_cflow_scope_system,
tvb, offset, length, ENC_NA);
break;
case 2: /* interface */
ti = proto_tree_add_item(pdutree, hf_cflow_scope_interface,
proto_tree_add_item(pdutree, hf_cflow_scope_interface,
tvb, offset, length, ENC_NA);
break;
case 3: /* linecard */