aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2015-12-10 20:59:53 -0500
committerMichael Mann <mmann78@netscape.net>2015-12-11 03:43:03 +0000
commit99028789cbf3f0e6193d6158ff9e0e3b11b2c505 (patch)
tree268f6ff5280d30ceabeb82cf77cf3739f93f11c5
parent210dc9b3019246803f97880802c8faf9a70a4aa8 (diff)
Completely remove new_create_dissector_handle and new_register_dissector.
The macros are no longer needed because the conversion is complete. Change-Id: I42c4b937986d9707eff9225c444cbcab73f8e86a Reviewed-on: https://code.wireshark.org/review/12517 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--epan/packet.c4
-rw-r--r--epan/packet.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/epan/packet.c b/epan/packet.c
index f736f3a2d1..ba89b86d0f 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -2580,7 +2580,7 @@ dissector_handle_get_dissector_name(const dissector_handle_t handle)
/* Create an anonymous handle for a new dissector. */
dissector_handle_t
-new_create_dissector_handle(new_dissector_t dissector, const int proto)
+create_dissector_handle(new_dissector_t dissector, const int proto)
{
struct dissector_handle *handle;
@@ -2618,7 +2618,7 @@ destroy_dissector_handle(dissector_handle_t handle)
/* Register a new dissector by name. */
dissector_handle_t
-new_register_dissector(const char *name, new_dissector_t dissector, const int proto)
+register_dissector(const char *name, new_dissector_t dissector, const int proto)
{
struct dissector_handle *handle;
diff --git a/epan/packet.h b/epan/packet.h
index fbc4eb7eb1..998d307a58 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -511,7 +511,6 @@ WS_DLL_PUBLIC void heur_dissector_add(const char *name, heur_dissector_t dissect
WS_DLL_PUBLIC void heur_dissector_delete(const char *name, heur_dissector_t dissector, const int proto);
/** Register a new dissector. */
-#define new_register_dissector register_dissector
WS_DLL_PUBLIC dissector_handle_t register_dissector(const char *name, new_dissector_t dissector, const int proto);
/** Deregister a dissector. */
@@ -536,7 +535,6 @@ WS_DLL_PUBLIC dissector_handle_t find_dissector(const char *name);
WS_DLL_PUBLIC const char *dissector_handle_get_dissector_name(const dissector_handle_t handle);
/** Create an anonymous handle for a dissector. */
-#define new_create_dissector_handle create_dissector_handle
WS_DLL_PUBLIC dissector_handle_t create_dissector_handle(new_dissector_t dissector,
const int proto);
WS_DLL_PUBLIC dissector_handle_t create_dissector_handle_with_name(new_dissector_t dissector,