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

Remove some dead initializers 

Change-Id: I16c88b5e8f6e79a0d9b33b9c3c4d94f77ecfdfa2
Reviewed-on: https://code.wireshark.org/review/6723
Reviewed-by: Bill Meier <wmeier@newsguy.com>
This commit is contained in:
Bill Meier 2015-01-21 15:49:12 -05:00
parent b0f37ba3d2
commit bc5c4846cc
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ static void
dissect_chargen(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree* chargen_tree;
proto_item* ti = NULL;
proto_item* ti;
guint8* data;
guint32 len;

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

@ -1338,7 +1338,7 @@ dissect_usb_device_qualifier_descriptor(packet_info *pinfo _U_, proto_tree *pare
{
proto_item *item;
proto_tree *tree;
proto_item *nitem = NULL;
proto_item *nitem;
int old_offset = offset;
guint32 protocol;
const gchar *description;
@ -1420,7 +1420,7 @@ dissect_usb_device_descriptor(packet_info *pinfo, proto_tree *parent_tree,
{
proto_item *item;
proto_tree *tree;
proto_item *nitem = NULL;
proto_item *nitem;
int old_offset = offset;
guint32 protocol;
const gchar *description;

20
epan/dissectors/packet-zbee-nwk.c
View File

@ -357,10 +357,9 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
{
tvbuff_t *payload_tvb = NULL;
proto_item *proto_root = NULL;
proto_item *proto_root;
proto_item *ti = NULL;
proto_tree *nwk_tree = NULL;
proto_tree *field_tree = NULL;
proto_tree *nwk_tree;
zbee_nwk_packet packet;
ieee802154_packet *ieee_packet;
@ -605,9 +604,10 @@ dissect_zbee_nwk_full(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void
/* Add the Source Route field. (ZigBee 2006 and later). */
if ((packet.version >= ZBEE_VERSION_2007) && packet.route) {
guint8 relay_count;
guint16 relay_addr;
guint i;
proto_tree *field_tree;
guint8 relay_count;
guint16 relay_addr;
guint i;
/* Create a subtree for the source route field. */
field_tree = proto_tree_add_subtree(nwk_tree, tvb, offset, 1, ett_zbee_nwk_route, &ti, "Source Route");
@ -1364,8 +1364,8 @@ static int dissect_zbee_beacon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
{
ieee802154_packet *packet;
proto_item *beacon_root = NULL;
proto_tree *beacon_tree = NULL;
proto_item *beacon_root;
proto_tree *beacon_tree;
guint offset = 0;
guint8 version;
@ -1504,8 +1504,8 @@ static int dissect_zbip_beacon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
{
ieee802154_packet *packet = (ieee802154_packet *)data;
proto_item *beacon_root = NULL;
proto_tree *beacon_tree = NULL;
proto_item *beacon_root;
proto_tree *beacon_tree;
guint offset = 0;
guint8 proto_id;
char *ssid;