Register ett[] subtree array only once.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29309 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 7 insertions, 8 deletions

diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c
index e0e159fddd..d91c8f2c72 100644
--- a/epan/dissectors/packet-gsm_a_rr.c
+++ b/epan/dissectors/packet-gsm_a_rr.c
@@ -8398,9 +8398,9 @@ void get_rr_msg_params(guint8 oct, const gchar **msg_str, int *ett_tree, int *hf
     gint			idx;
 
     *msg_str = match_strval_idx((guint32) (oct & DTAP_RR_IEI_MASK), gsm_a_dtap_msg_rr_strings, &idx);
-    *ett_tree = ett_gsm_dtap_msg_rr[idx];
+    *ett_tree = ett_gsm_dtap_msg_rr[idx]; // -1 !!
     *hf_idx = hf_gsm_a_dtap_msg_rr_type;
-    *msg_fcn = dtap_msg_rr_fcn[idx];
+    *msg_fcn = dtap_msg_rr_fcn[idx];      // -1 !!
 
     return;
 }
@@ -8656,9 +8656,9 @@ void get_rr_short_pd_msg_params(guint8 mess_type, const gchar **msg_str, int *et
     gint			idx;
 
     *msg_str = match_strval_idx((guint32) mess_type, gsm_a_sacch_msg_rr_strings, &idx);
-    *ett_tree = ett_gsm_sacch_msg_rr[idx];
+    *ett_tree = ett_gsm_sacch_msg_rr[idx]; // -1 !!
     *hf_idx = hf_gsm_a_sacch_msg_rr_type;
-    *msg_fcn = sacch_msg_rr_fcn[idx];
+    *msg_fcn = sacch_msg_rr_fcn[idx];      // -1 !!
 }
 
 const value_string short_protocol_discriminator_vals[] = {
@@ -10133,8 +10133,6 @@ proto_register_gsm_a_rr(void)
 
     proto_register_field_array(proto_a_ccch, hf, array_length(hf));
 
-    proto_register_subtree_array(ett, array_length(ett));
-
     /* subdissector code */
     register_dissector("gsm_a_ccch", dissect_ccch, proto_a_ccch);
 
@@ -10144,10 +10142,11 @@ proto_register_gsm_a_rr(void)
 
     proto_register_field_array(proto_a_sacch, hf_sacch, array_length(hf_sacch));
 
-    proto_register_subtree_array(ett, array_length(ett));
-
     /* subdissector code */
     register_dissector("gsm_a_sacch", dissect_sacch, proto_a_sacch);
+
+    /* subtree array (for both sub-dissectors) */
+    proto_register_subtree_array(ett, array_length(ett));
 }
 
 void