aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-aol.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2015-01-20 15:26:54 -0500
committerBill Meier <wmeier@newsguy.com>2015-01-20 20:52:39 +0000
commit0169cc86af4056bd36ec78a59bed84fb5f130584 (patch)
tree708dc0e8c7d9e20fd78e79aae9caff222a1d64b5 /epan/dissectors/packet-aol.c
parenteefd52983532b1bc97a2fe7d499c9c917004e8cc (diff)
Remove some dead initializers
Change-Id: I0478fa5c476a1914ae0c18feafc7720dd3111d84 Reviewed-on: https://code.wireshark.org/review/6690 Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'epan/dissectors/packet-aol.c')
-rw-r--r--epan/dissectors/packet-aol.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/epan/dissectors/packet-aol.c b/epan/dissectors/packet-aol.c
index 65956033f1..ce6085e66f 100644
--- a/epan/dissectors/packet-aol.c
+++ b/epan/dissectors/packet-aol.c
@@ -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);