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

Remove some dead initializers 

Change-Id: I0478fa5c476a1914ae0c18feafc7720dd3111d84
Reviewed-on: https://code.wireshark.org/review/6690
Reviewed-by: Bill Meier <wmeier@newsguy.com>
This commit is contained in:
Bill Meier 2015-01-20 15:26:54 -05:00
parent eefd529835
commit 0169cc86af
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-2dparityfec.c
View File

@ -265,8 +265,8 @@ static void dissect_2dparityfec(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
if(tree)
{
/* we are being asked for details */
proto_item *ti = NULL;
proto_tree *tree_2dparityfec = NULL;
proto_item *ti;
proto_tree *tree_2dparityfec;
gint offset = 0;
ti = proto_tree_add_item(tree, hfi_2dparityfec, tvb, 0, -1, ENC_NA);

15
epan/dissectors/packet-aol.c
View File

@ -135,8 +135,8 @@ static gboolean aol_desegment = TRUE;
* Dissect the 'INIT' PDU.
*/
static guint dissect_aol_init(tvbuff_t *tvb, packet_info *pinfo _U_, guint offset, proto_tree *tree) {
proto_item *data_item = NULL;
proto_tree *data_tree = NULL;
proto_item *data_item;
proto_tree *data_tree;
guint16 dos_ver = 0;
guint16 win_ver = 0;
@ -207,12 +207,10 @@ static guint get_aol_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
* Dissect a PDU
*/
static int dissect_aol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) {
proto_item *ti = NULL;
proto_tree *aol_tree = NULL;
proto_item *ti;
proto_tree *aol_tree;
guint offset = 0;
guint old_offset = 0;
guint16 token = 0;
guint16 pdu_len = 0;
guint16 pdu_len;
guint8 pdu_type = 0;
/* Set the protocol name, and info column text. */
@ -247,7 +245,7 @@ static int dissect_aol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
/* Now for the data... */
if (pdu_len > 0) {
old_offset = offset;
guint old_offset = offset;
if (tvb_length_remaining(tvb,offset) > pdu_len) {
/* Init packets are a special case */
@ -255,6 +253,7 @@ static int dissect_aol_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
offset = dissect_aol_init(tvb,pinfo,offset,aol_tree);
} else {
if (pdu_len >= 2) {
guint16 token;
/* Get the token */
token = tvb_get_ntohs(tvb,offset);

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

@ -134,8 +134,8 @@ dissect_arcnet_common (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
int offset = 0;
guint8 dst, src, protID, split_flag;
tvbuff_t *next_tvb;
proto_item *ti = NULL;
proto_tree *arcnet_tree = NULL;
proto_item *ti;
proto_tree *arcnet_tree;
col_set_str (pinfo->cinfo, COL_PROTOCOL, "ARCNET");