Rename new_dissector_t to dissector_t.

There are no longer any "old" dissectors, so "new_" is redundant.

Change-Id: I5fee51228c2a8562166f5991e1f30c2c697e45c8
Reviewed-on: https://code.wireshark.org/review/13273
Reviewed-by: Guy Harris <guy@alum.mit.edu>

12 files changed, 33 insertions, 33 deletions

diff --git a/asn1/dap/dap.cnf b/asn1/dap/dap.cnf
index 622734ece4..c20d57af02 100644
--- a/asn1/dap/dap.cnf
+++ b/asn1/dap/dap.cnf
@@ -211,7 +211,7 @@ static const ros_opr_t dap_opr_tab[] = {
   /* %(_name)s */
   { %(&operationCode)-25s,	%(_argument_pdu)s,	%(_result_pdu)s },
 #.TABLE11_FTR
-  { 0,				(new_dissector_t)(-1),	(new_dissector_t)(-1) },
+  { 0,				(dissector_t)(-1),	(dissector_t)(-1) },
 };
 #.END
 
@@ -221,7 +221,7 @@ static const ros_err_t dap_err_tab[] = {
   /* %(_name)s*/
   { %(&errorCode)s,	%(_parameter_pdu)s },
 #.TABLE21_FTR
-  { 0,	(new_dissector_t)(-1) },
+  { 0,	(dissector_t)(-1) },
 };
 #.END
 
diff --git a/asn1/h450/packet-h450-template.c b/asn1/h450/packet-h450-template.c
index 23b82c08ec..ffb0de0157 100644
--- a/asn1/h450/packet-h450-template.c
+++ b/asn1/h450/packet-h450-template.c
@@ -78,8 +78,8 @@ static rose_ctx_t h450_rose_ctx;
 
 typedef struct _h450_op_t {
   gint32 opcode;
-  new_dissector_t arg_pdu;
-  new_dissector_t res_pdu;
+  dissector_t arg_pdu;
+  dissector_t res_pdu;
 } h450_op_t;
 
 static const h450_op_t h450_op_tab[] = {
@@ -88,7 +88,7 @@ static const h450_op_t h450_op_tab[] = {
 
 typedef struct _h450_err_t {
   gint32 errcode;
-  new_dissector_t err_pdu;
+  dissector_t err_pdu;
 } h450_err_t;
 
 static const h450_err_t h450_err_tab[] = {
diff --git a/asn1/h460/packet-h460-template.c b/asn1/h460/packet-h460-template.c
index 1f45ff7419..586cec4ab1 100644
--- a/asn1/h460/packet-h460-template.c
+++ b/asn1/h460/packet-h460-template.c
@@ -78,7 +78,7 @@ typedef struct _h460_feature_t {
   guint32 opt;
   const gchar *id;
   const gchar *name;
-  new_dissector_t content_pdu;
+  dissector_t content_pdu;
   /*---*/
   const gchar *key_gd;
   const gchar *key_fd;
diff --git a/asn1/inap/inap.cnf b/asn1/inap/inap.cnf
index 3f4e59a435..06ab3e28d3 100644
--- a/asn1/inap/inap.cnf
+++ b/asn1/inap/inap.cnf
@@ -125,8 +125,8 @@ static int dissect_returnErrorData(proto_tree *tree, tvbuff_t *tvb, int offset,a
 #.TABLE11_HDR
 typedef struct _inap_op_t {
   gint32 opcode;
-  new_dissector_t arg_pdu;
-  new_dissector_t res_pdu;
+  dissector_t arg_pdu;
+  dissector_t res_pdu;
 } inap_op_t;
 
 static const inap_op_t inap_op_tab[] = {
@@ -139,7 +139,7 @@ static const inap_op_t inap_op_tab[] = {
 #.TABLE11_HDR
 typedef struct _inap_err_t {
   gint32 errcode;
-  new_dissector_t err_pdu;
+  dissector_t err_pdu;
 } inap_err_t;
 
 static const inap_err_t inap_err_tab[] = {
diff --git a/asn1/isdn-sup/packet-isdn-sup-template.c b/asn1/isdn-sup/packet-isdn-sup-template.c
index 2b735eec36..dc8f129551 100644
--- a/asn1/isdn-sup/packet-isdn-sup-template.c
+++ b/asn1/isdn-sup/packet-isdn-sup-template.c
@@ -53,20 +53,20 @@ static rose_ctx_t isdn_sup_rose_ctx;
 
 typedef struct _isdn_sup_op_t {
   gint32 opcode;
-  new_dissector_t arg_pdu;
-  new_dissector_t res_pdu;
+  dissector_t arg_pdu;
+  dissector_t res_pdu;
 } isdn_sup_op_t;
 
 typedef struct _isdn_global_sup_op_t {
   const char*  oid;
-  new_dissector_t arg_pdu;
-  new_dissector_t res_pdu;
+  dissector_t arg_pdu;
+  dissector_t res_pdu;
 } isdn_sup_global_op_t;
 
 
 typedef struct isdn_sup_err_t {
   gint32 errcode;
-  new_dissector_t err_pdu;
+  dissector_t err_pdu;
 } isdn_sup_err_t;
 
 static const value_string isdn_sup_str_operation[] = {
diff --git a/asn1/p1/p1.cnf b/asn1/p1/p1.cnf
index 88df12e59d..f077216af1 100644
--- a/asn1/p1/p1.cnf
+++ b/asn1/p1/p1.cnf
@@ -326,7 +326,7 @@ static const ros_opr_t p3_opr_tab[] = {
   /* %(_name)s */
   { %(&operationCode)-25s,	%(_argument_pdu)s,	%(_result_pdu)s },
 #.TABLE11_FTR
-  { 0,				(new_dissector_t)(-1),	(new_dissector_t)(-1) },
+  { 0,				(dissector_t)(-1),	(dissector_t)(-1) },
 };
 #.END
 
@@ -336,7 +336,7 @@ static const ros_err_t p3_err_tab[] = {
   /* %(_name)s*/
   { %(&errorCode)s,	%(_parameter_pdu)s },
 #.TABLE21_FTR
-  { 0,	(new_dissector_t)(-1) },
+  { 0,	(dissector_t)(-1) },
 };
 #.END
 
diff --git a/asn1/p7/p7.cnf b/asn1/p7/p7.cnf
index 94d1ed9046..ab46e42a9d 100644
--- a/asn1/p7/p7.cnf
+++ b/asn1/p7/p7.cnf
@@ -186,7 +186,7 @@ static const ros_opr_t p7_opr_tab[] = {
   /* %(_name)s */
   { %(&operationCode)-25s,	%(_argument_pdu)s,	%(_result_pdu)s },
 #.TABLE11_FTR
-  { 0,				(new_dissector_t)(-1),	(new_dissector_t)(-1) },
+  { 0,				(dissector_t)(-1),	(dissector_t)(-1) },
 };
 #.END
 
@@ -196,7 +196,7 @@ static const ros_err_t p7_err_tab[] = {
   /* %(_name)s*/
   { %(&errorCode)s,	%(_parameter_pdu)s },
 #.TABLE21_FTR
-  { 0,	(new_dissector_t)(-1) },
+  { 0,	(dissector_t)(-1) },
 };
 #.END
 
diff --git a/asn1/qsig/packet-qsig-template.c b/asn1/qsig/packet-qsig-template.c
index ae888c2e44..068673f9c0 100644
--- a/asn1/qsig/packet-qsig-template.c
+++ b/asn1/qsig/packet-qsig-template.c
@@ -330,8 +330,8 @@ static dissector_table_t extension_dissector_table;
 
 typedef struct _qsig_op_t {
   gint32 opcode;
-  new_dissector_t arg_pdu;
-  new_dissector_t res_pdu;
+  dissector_t arg_pdu;
+  dissector_t res_pdu;
 } qsig_op_t;
 
 static const qsig_op_t qsig_op_tab[] = {
@@ -340,7 +340,7 @@ static const qsig_op_t qsig_op_tab[] = {
 
 typedef struct _qsig_err_t {
   gint32 errcode;
-  new_dissector_t err_pdu;
+  dissector_t err_pdu;
 } qsig_err_t;
 
 static const qsig_err_t qsig_err_tab[] = {
diff --git a/asn1/ros/packet-ros-template.c b/asn1/ros/packet-ros-template.c
index 626a4c0ea8..12f1b0b624 100644
--- a/asn1/ros/packet-ros-template.c
+++ b/asn1/ros/packet-ros-template.c
@@ -114,11 +114,11 @@ register_ros_protocol_info(const char *oid, const ros_info_t *rinfo, int proto _
 	  register_ber_oid_dissector_handle(oid, ros_handle, proto, name);
 }
 
-static new_dissector_t ros_lookup_opr_dissector(gint32 opcode_lcl, const ros_opr_t *operations, gboolean argument)
+static dissector_t ros_lookup_opr_dissector(gint32 opcode_lcl, const ros_opr_t *operations, gboolean argument)
 {
 	/* we don't know what order asn2wrs/module definition is, so ... */
 	if(operations) {
-		for(;operations->arg_pdu != (new_dissector_t)(-1); operations++)
+		for(;operations->arg_pdu != (dissector_t)(-1); operations++)
 			if(operations->opcode == opcode_lcl)
 				return argument ? operations->arg_pdu : operations->res_pdu;
 
@@ -126,11 +126,11 @@ static new_dissector_t ros_lookup_opr_dissector(gint32 opcode_lcl, const ros_opr
 	return NULL;
 }
 
-static new_dissector_t ros_lookup_err_dissector(gint32 errcode, const ros_err_t *errors)
+static dissector_t ros_lookup_err_dissector(gint32 errcode, const ros_err_t *errors)
 {
 	/* we don't know what order asn2wrs/module definition is, so ... */
 	if(errors) {
-		for(;errors->err_pdu != (new_dissector_t) (-1); errors++) {
+		for(;errors->err_pdu != (dissector_t) (-1); errors++) {
 			if(errors->errcode == errcode)
 				return errors->err_pdu;
 		}
@@ -146,7 +146,7 @@ ros_try_string(const char *oid, tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
 	gint32     opcode_lcl = 0;
 	const gchar *opname = NULL;
 	const gchar *suffix = NULL;
-	new_dissector_t opdissector = NULL;
+	dissector_t opdissector = NULL;
 	const value_string *lookup;
 	proto_item *item=NULL;
 	proto_tree *ros_tree=NULL;
diff --git a/asn1/ros/packet-ros-template.h b/asn1/ros/packet-ros-template.h
index 3ee979b775..8a41af0875 100644
--- a/asn1/ros/packet-ros-template.h
+++ b/asn1/ros/packet-ros-template.h
@@ -52,13 +52,13 @@
 
 typedef struct _ros_opr_t {
   gint32 opcode;
-  new_dissector_t arg_pdu;
-  new_dissector_t res_pdu;
+  dissector_t arg_pdu;
+  dissector_t res_pdu;
 } ros_opr_t;
 
 typedef struct _ros_err_t {
   gint32 errcode;
-  new_dissector_t err_pdu;
+  dissector_t err_pdu;
 } ros_err_t;
 
 typedef struct _ros_info_t {
diff --git a/asn1/t124/packet-t124-template.c b/asn1/t124/packet-t124-template.c
index e9b641b2f3..db299b544c 100644
--- a/asn1/t124/packet-t124-template.c
+++ b/asn1/t124/packet-t124-template.c
@@ -74,7 +74,7 @@ static const per_sequence_t t124Heur_sequence[] = {
 };
 
 void
-register_t124_ns_dissector(const char *nsKey, new_dissector_t dissector, int proto)
+register_t124_ns_dissector(const char *nsKey, dissector_t dissector, int proto)
 {
   dissector_handle_t dissector_handle;
 
@@ -82,7 +82,7 @@ register_t124_ns_dissector(const char *nsKey, new_dissector_t dissector, int pro
   dissector_add_string("t124.ns", nsKey, dissector_handle);
 }
 
-void register_t124_sd_dissector(packet_info *pinfo _U_, guint32 channelId_param, new_dissector_t dissector, int proto)
+void register_t124_sd_dissector(packet_info *pinfo _U_, guint32 channelId_param, dissector_t dissector, int proto)
 {
   /* XXX: we should keep the sub-dissectors list per conversation
      as the same channels may be used.
diff --git a/asn1/t124/packet-t124-template.h b/asn1/t124/packet-t124-template.h
index f86b48501c..487718c86a 100644
--- a/asn1/t124/packet-t124-template.h
+++ b/asn1/t124/packet-t124-template.h
@@ -31,8 +31,8 @@ extern int dissect_DomainMCSPDU_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, p
 extern guint32 t124_get_last_channelId(void);
 extern void t124_set_top_tree(proto_tree *tree);
 
-extern void register_t124_ns_dissector(const char *nsKey, new_dissector_t dissector, int proto);
-extern void register_t124_sd_dissector(packet_info *pinfo, guint32 channelId, new_dissector_t dissector, int proto);
+extern void register_t124_ns_dissector(const char *nsKey, dissector_t dissector, int proto);
+extern void register_t124_sd_dissector(packet_info *pinfo, guint32 channelId, dissector_t dissector, int proto);
 
 #include "packet-t124-exp.h"