pw: make ett names longer.

This makes it easier to find (and check) them programatically.

Change-Id: I8eb99116fa582eddc534659589b361edd91c085a
Reviewed-on: https://code.wireshark.org/review/30292
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>

3 files changed, 17 insertions, 17 deletions

diff --git a/epan/dissectors/packet-pw-cesopsn.c b/epan/dissectors/packet-pw-cesopsn.c
index bc383b82bb..a7d4038636 100644
--- a/epan/dissectors/packet-pw-cesopsn.c
+++ b/epan/dissectors/packet-pw-cesopsn.c
@@ -30,7 +30,7 @@ void proto_register_pw_cesopsn(void);
 void proto_reg_handoff_pw_cesopsn(void);
 
 static gint proto = -1;
-static gint ett = -1;
+static gint ett_pw_cesopsn = -1;
 
 static int hf_cw = -1;
 static int hf_cw_bits03 = -1;
@@ -246,7 +246,7 @@ void dissect_pw_cesopsn( tvbuff_t * tvb_original
 		pwc_item_append_text_n_items(item,(int)payload_size,"octet");
 		{
 			proto_tree* tree2;
-			tree2 = proto_item_add_subtree(item, ett);
+			tree2 = proto_item_add_subtree(item, ett_pw_cesopsn);
 			{
 				tvbuff_t* tvb;
 				proto_item* item2;
@@ -255,7 +255,7 @@ void dissect_pw_cesopsn( tvbuff_t * tvb_original
 				pwc_item_append_cw(item2,tvb_get_ntohl(tvb, 0),FALSE);
 				{
 					proto_tree* tree3;
-					tree3 = proto_item_add_subtree(item, ett);
+					tree3 = proto_item_add_subtree(item, ett_pw_cesopsn);
 					{
 						proto_item* item3;
 						if (properties & PWC_CW_BAD_BITS03) /*display only if value is wrong*/
@@ -322,7 +322,7 @@ void dissect_pw_cesopsn( tvbuff_t * tvb_original
 		else
 		{
 			proto_tree* tree2;
-			tree2 = proto_item_add_subtree(item, ett);
+			tree2 = proto_item_add_subtree(item, ett_pw_cesopsn);
 			{
 				proto_item* item2;
 				tvbuff_t* tvb;
@@ -334,7 +334,7 @@ void dissect_pw_cesopsn( tvbuff_t * tvb_original
 					expert_add_info_format(pinfo, item2, &ei_payload_size_invalid_error,
 						"CESoPSN packet payload size must be multiple of 8");
 				}
-				tree2 = proto_item_add_subtree(item2, ett);
+				tree2 = proto_item_add_subtree(item2, ett_pw_cesopsn);
 				call_data_dissector(tvb, pinfo, tree2);
 				item2 = proto_tree_add_int(tree2, hf_payload_l, tvb, 0, 0
 					,(int)payload_size); /* allow filtering */
@@ -346,7 +346,7 @@ void dissect_pw_cesopsn( tvbuff_t * tvb_original
 		if (padding_size > 0)
 		{
 			proto_tree* tree2;
-			tree2 = proto_item_add_subtree(item, ett);
+			tree2 = proto_item_add_subtree(item, ett_pw_cesopsn);
 			{
 				tvbuff_t* tvb;
 				tvb = tvb_new_subset_length_caplen(tvb_original, PWC_SIZEOF_CW + payload_size, padding_size, -1);
@@ -415,7 +415,7 @@ void proto_register_pw_cesopsn(void)
 	};
 
 	static gint *ett_array[] = {
-		&ett
+		&ett_pw_cesopsn
 	};
 	static ei_register_info ei[] = {
 		{ &ei_packet_size_too_small, { "pwcesopsn.packet_size_too_small", PI_MALFORMED, PI_ERROR, "PW packet size is too small to carry sensible information", EXPFILL }},
diff --git a/epan/dissectors/packet-pw-common.c b/epan/dissectors/packet-pw-common.c
index e069d241b1..eeed9cf706 100644
--- a/epan/dissectors/packet-pw-common.c
+++ b/epan/dissectors/packet-pw-common.c
@@ -72,7 +72,7 @@ void pwc_item_append_text_n_items(proto_item* item, const int n, const char * co
 
 
 static gint proto_pw_padding = -1;
-static gint ett = -1;
+static gint ett_pw_common = -1;
 static int hf_padding_len = -1;
 
 static
@@ -84,7 +84,7 @@ int dissect_pw_padding(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, v
 	size = tvb_reported_length_remaining(tvb, 0);
 	item = proto_tree_add_item(tree, proto_pw_padding, tvb, 0, -1, ENC_NA);
 	pwc_item_append_text_n_items(item,size,"byte");
-	tree_p = proto_item_add_subtree(item, ett);
+	tree_p = proto_item_add_subtree(item, ett_pw_common);
 
 	call_data_dissector(tvb, pinfo, tree_p);
 	item = proto_tree_add_int(tree_p, hf_padding_len, tvb, 0, 0, size);
@@ -101,7 +101,7 @@ void proto_register_pw_padding(void)
 					,NULL						,HFILL }}
 	};
 	static gint *ett_array[] = {
-		&ett
+		&ett_pw_common
 	};
 	proto_pw_padding = proto_register_protocol("Pseudowire Padding","PW Padding","pw.padding");
 	proto_register_field_array(proto_pw_padding, hfpadding, array_length(hfpadding));
diff --git a/epan/dissectors/packet-pw-satop.c b/epan/dissectors/packet-pw-satop.c
index c78bf67d45..ddba278c66 100644
--- a/epan/dissectors/packet-pw-satop.c
+++ b/epan/dissectors/packet-pw-satop.c
@@ -29,7 +29,7 @@ void proto_register_pw_satop(void);
 void proto_reg_handoff_pw_satop(void);
 
 static gint proto = -1;
-static gint ett = -1;
+static gint ett_pw_satop = -1;
 
 static int hf_cw = -1;
 static int hf_cw_bits03 = -1;
@@ -244,7 +244,7 @@ void dissect_pw_satop(tvbuff_t * tvb_original
 		pwc_item_append_text_n_items(item,(int)payload_size,"octet");
 		{
 			proto_tree* tree2;
-			tree2 = proto_item_add_subtree(item, ett);
+			tree2 = proto_item_add_subtree(item, ett_pw_satop);
 			{
 				tvbuff_t* tvb;
 				proto_item* item2;
@@ -253,7 +253,7 @@ void dissect_pw_satop(tvbuff_t * tvb_original
 				pwc_item_append_cw(item2, tvb_get_ntohl(tvb, 0),FALSE);
 				{
 					proto_tree* tree3;
-					tree3 = proto_item_add_subtree(item2, ett);
+					tree3 = proto_item_add_subtree(item2, ett_pw_satop);
 					{
 						proto_item* item3;
 						if (properties & PWC_CW_BAD_BITS03) /*display only if value is wrong*/
@@ -317,7 +317,7 @@ void dissect_pw_satop(tvbuff_t * tvb_original
 		{
 
 			proto_tree* tree2;
-			tree2 = proto_item_add_subtree(item, ett);
+			tree2 = proto_item_add_subtree(item, ett_pw_satop);
 			{
 				proto_item* item2;
 				tvbuff_t* tvb;
@@ -347,7 +347,7 @@ void dissect_pw_satop(tvbuff_t * tvb_original
 						break;
 					}
 					proto_item_append_text(item2, "%s", s);
-					tree3 = proto_item_add_subtree(item2, ett);
+					tree3 = proto_item_add_subtree(item2, ett_pw_satop);
 					call_data_dissector(tvb, pinfo, tree3);
 					item2 = proto_tree_add_int(tree3, hf_payload_l, tvb, 0, 0
 						,(int)payload_size); /* allow filtering */
@@ -360,7 +360,7 @@ void dissect_pw_satop(tvbuff_t * tvb_original
 		if (padding_size > 0)
 		{
 			proto_tree* tree2;
-			tree2 = proto_item_add_subtree(item, ett);
+			tree2 = proto_item_add_subtree(item, ett_pw_satop);
 			{
 				tvbuff_t* tvb;
 				tvb = tvb_new_subset_length_caplen(tvb_original, PWC_SIZEOF_CW + payload_size, padding_size, -1);
@@ -433,7 +433,7 @@ void proto_register_pw_satop(void)
 	};
 
 	static gint *ett_array[] = {
-		&ett
+		&ett_pw_satop
 	};
 	static ei_register_info ei[] = {
 		{ &ei_cw_packet_size_too_small, { "pwsatop.packet_size_too_small", PI_MALFORMED, PI_ERROR, "PW packet size (%d) is too small to carry sensible information", EXPFILL }},