From 9a1df711f27f2eb20b884f76a93c8257e3bb8c55 Mon Sep 17 00:00:00 2001 From: AndersBroman Date: Fri, 14 Nov 2014 15:39:45 +0100 Subject: [PATCH] [S1AP) Wrong tree used s1ap.cnf:547:14: error: variable 'subtree' set but not used Change-Id: I84a345709b1ef9688f3f1a4e876a75dd575c1c2e Reviewed-on: https://code.wireshark.org/review/5299 Reviewed-by: Anders Broman --- asn1/s1ap/s1ap.cnf | 2 +- epan/dissectors/packet-s1ap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/asn1/s1ap/s1ap.cnf b/asn1/s1ap/s1ap.cnf index 7c3e9c1c48..033956a325 100644 --- a/asn1/s1ap/s1ap.cnf +++ b/asn1/s1ap/s1ap.cnf @@ -551,7 +551,7 @@ if (gcsna_handle) { return offset; subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_Cdma2000SectorID); - dissect_a21_ie_common(parameter_tvb, %(ACTX)s->pinfo, NULL/* Top tree not needed */, tree, 0, 0 /* message_type not needed */); + dissect_a21_ie_common(parameter_tvb, %(ACTX)s->pinfo, NULL/* Top tree not needed */, subtree, 0, 0 /* message_type not needed */); #.TYPE_ATTR diff --git a/epan/dissectors/packet-s1ap.c b/epan/dissectors/packet-s1ap.c index 7012ce43d3..337f10329a 100644 --- a/epan/dissectors/packet-s1ap.c +++ b/epan/dissectors/packet-s1ap.c @@ -2803,7 +2803,7 @@ dissect_s1ap_Cdma2000SectorID(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *act return offset; subtree = proto_item_add_subtree(actx->created_item, ett_s1ap_Cdma2000SectorID); - dissect_a21_ie_common(parameter_tvb, actx->pinfo, NULL/* Top tree not needed */, tree, 0, 0 /* message_type not needed */); + dissect_a21_ie_common(parameter_tvb, actx->pinfo, NULL/* Top tree not needed */, subtree, 0, 0 /* message_type not needed */);