diff options
author | Michael Mann <mmann78@netscape.net> | 2015-11-24 07:36:49 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-11-24 14:52:50 +0000 |
commit | 50880308262e3ca6812eee05bb113081f3144877 (patch) | |
tree | 134599151dc8e6c9c8329d6126ac3a1ee672b60e /epan | |
parent | 8df0bac6cf524af04b48579fc0ae78aaa9928d60 (diff) | |
download | wireshark-50880308262e3ca6812eee05bb113081f3144877.tar.gz |
Remove register_dissector.
new_register_dissector will eventually take its place, but that search/replace should be done when all "old style" APIs have been removed.
Change-Id: Ic3fdec67d5761fd72beeca7355f9de617562bb77
Reviewed-on: https://code.wireshark.org/review/12095
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
-rw-r--r-- | epan/packet.c | 21 | ||||
-rw-r--r-- | epan/packet.h | 3 |
2 files changed, 0 insertions, 24 deletions
diff --git a/epan/packet.c b/epan/packet.c index efd13b8135..00b4f695eb 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -2651,27 +2651,6 @@ destroy_dissector_handle(dissector_handle_t handle) wmem_free(wmem_epan_scope(), handle); } -/* Register a dissector by name. */ -dissector_handle_t -register_dissector(const char *name, dissector_t dissector, const int proto) -{ - struct dissector_handle *handle; - - /* Make sure the registration is unique */ - g_assert(g_hash_table_lookup(registered_dissectors, name) == NULL); - - handle = wmem_new(wmem_epan_scope(), struct dissector_handle); - handle->name = name; - handle->is_new = FALSE; - handle->dissector.old = dissector; - handle->protocol = find_protocol_by_id(proto); - - g_hash_table_insert(registered_dissectors, (gpointer)name, - (gpointer) handle); - - return handle; -} - /* Register a new dissector by name. */ dissector_handle_t new_register_dissector(const char *name, new_dissector_t dissector, const int proto) diff --git a/epan/packet.h b/epan/packet.h index 9e54ebe892..66ef30ec17 100644 --- a/epan/packet.h +++ b/epan/packet.h @@ -515,9 +515,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 dissector. */ -WS_DLL_PUBLIC dissector_handle_t register_dissector(const char *name, dissector_t dissector, const int proto); - /** Register a new dissector. */ WS_DLL_PUBLIC dissector_handle_t new_register_dissector(const char *name, new_dissector_t dissector, const int proto); |