osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

[-Wunused-but-set-variable] 

svn path=/trunk/; revision=39829
This commit is contained in:
Anders Broman 2011-11-14 17:35:04 +00:00
parent fa5c7f85aa
commit 34ea886454
6 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asn1/h248/packet-h248-template.c
View File

@ -1108,7 +1108,7 @@ static int dissect_h248_PropertyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int
gboolean pc, ind;
gint32 tag;
guint32 len;
guint16 name_major;
/*guint16 name_major;*/
guint16 name_minor;
int end_offset;
tvbuff_t *next_tvb;
@ -1127,7 +1127,7 @@ static int dissect_h248_PropertyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int
next_tvb = tvb_new_subset(tvb, offset , len , len );
name_major = packageandid >> 16;
/*name_major = packageandid >> 16;*/
name_minor = packageandid & 0xffff;
pkg = (curr_info.pkg) ? curr_info.pkg : &no_package;

3
asn1/inap/packet-inap-template.c
View File

@ -128,12 +128,9 @@ dissect_inap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
proto_item *item=NULL;
proto_tree *tree=NULL;
int offset = 0;
guint length;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
length = tvb_length(tvb);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "INAP");
/* create display subtree for the protocol */

3
asn1/ros/packet-ros-template.c
View File

@ -137,7 +137,6 @@ static gboolean ros_try_string(const char *oid, tvbuff_t *tvb, packet_info *pinf
gint32 opcode_lcl = 0;
const gchar *opname = NULL;
const gchar *suffix = NULL;
int offset = 0;
new_dissector_t opdissector = NULL;
const value_string *lookup;
proto_item *item=NULL;
@ -196,7 +195,7 @@ static gboolean ros_try_string(const char *oid, tvbuff_t *tvb, packet_info *pinf
col_append_str(pinfo->cinfo, COL_INFO, suffix);
}
offset = (*opdissector)(tvb, pinfo, ros_tree);
(*opdissector)(tvb, pinfo, ros_tree);
return TRUE;
}

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

@ -1585,7 +1585,7 @@ static int dissect_h248_PropertyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int
gboolean pc, ind;
gint32 tag;
guint32 len;
guint16 name_major;
/*guint16 name_major;*/
guint16 name_minor;
int end_offset;
tvbuff_t *next_tvb;
@ -1604,7 +1604,7 @@ static int dissect_h248_PropertyID(gboolean implicit_tag _U_, tvbuff_t *tvb, int
next_tvb = tvb_new_subset(tvb, offset , len , len );
name_major = packageandid >> 16;
/*name_major = packageandid >> 16;*/
name_minor = packageandid & 0xffff;
pkg = (curr_info.pkg) ? curr_info.pkg : &no_package;

7
epan/dissectors/packet-inap.c
View File

@ -9353,12 +9353,9 @@ dissect_inap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
proto_item *item=NULL;
proto_tree *tree=NULL;
int offset = 0;
guint length;
asn1_ctx_t asn1_ctx;
asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo);
length = tvb_length(tvb);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "INAP");
/* create display subtree for the protocol */
@ -11669,7 +11666,7 @@ void proto_register_inap(void) {
"InvokeId_present", HFILL }},
/*--- End of included file: packet-inap-hfarr.c ---*/
#line 203 "../../asn1/inap/packet-inap-template.c"
#line 200 "../../asn1/inap/packet-inap-template.c"
};
@ -11923,7 +11920,7 @@ void proto_register_inap(void) {
&ett_inap_InvokeId,
/*--- End of included file: packet-inap-ettarr.c ---*/
#line 216 "../../asn1/inap/packet-inap-template.c"
#line 213 "../../asn1/inap/packet-inap-template.c"
};
/* Register protocol */

9
epan/dissectors/packet-ros.c
View File

@ -191,7 +191,6 @@ static gboolean ros_try_string(const char *oid, tvbuff_t *tvb, packet_info *pinf
gint32 opcode_lcl = 0;
const gchar *opname = NULL;
const gchar *suffix = NULL;
int offset = 0;
new_dissector_t opdissector = NULL;
const value_string *lookup;
proto_item *item=NULL;
@ -250,7 +249,7 @@ static gboolean ros_try_string(const char *oid, tvbuff_t *tvb, packet_info *pinf
col_append_str(pinfo->cinfo, COL_INFO, suffix);
}
offset = (*opdissector)(tvb, pinfo, ros_tree);
(*opdissector)(tvb, pinfo, ros_tree);
return TRUE;
}
@ -1013,7 +1012,7 @@ dissect_ros_Code(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a
/*--- End of included file: packet-ros-fn.c ---*/
#line 372 "../../asn1/ros/packet-ros-template.c"
#line 371 "../../asn1/ros/packet-ros-template.c"
/*
* Dissect ROS PDUs inside a PPDU.
@ -1245,7 +1244,7 @@ void proto_register_ros(void) {
"OBJECT_IDENTIFIER", HFILL }},
/*--- End of included file: packet-ros-hfarr.c ---*/
#line 491 "../../asn1/ros/packet-ros-template.c"
#line 490 "../../asn1/ros/packet-ros-template.c"
};
/* List of subtrees */
@ -1266,7 +1265,7 @@ void proto_register_ros(void) {
&ett_ros_Code,
/*--- End of included file: packet-ros-ettarr.c ---*/
#line 498 "../../asn1/ros/packet-ros-template.c"
#line 497 "../../asn1/ros/packet-ros-template.c"
};
/* Register protocol */