osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Michael Mann 2015-11-24 07:36:49 -05:00
parent 8df0bac6cf
commit 5088030826
3 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/libwireshark0.symbols vendored
View File

@ -1143,7 +1143,6 @@ libwireshark.so.0 libwireshark0 #MINVER#
register_conversation_filter@Base 2.0.0
register_custom_dissector_table@Base 1.99.8
register_decode_as@Base 1.12.0~rc1
register_dissector@Base 1.9.1
register_dissector_table@Base 1.9.1
register_export_pdu_tap@Base 1.99.0
register_final_registration_routine@Base 1.9.1

21
epan/packet.c
View File

@ -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)

3
epan/packet.h
View File

@ -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);