aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2015-12-10 19:47:01 +0100
committerStig Bjørlykke <stig@bjorlykke.org>2015-12-11 08:35:11 +0000
commit2fd168c134092a4e0cc587f6c474dd38681a6c23 (patch)
treecd7ce67bc4b84a3b4efac72b7a157b8cbf0e8ee2 /epan
parent9cbb646524d822149df06715b10677dc7736dfae (diff)
epan: Don't export deregister functions
Most of the deregister functions are used internally from Lua while reloading plugins. Don't export them for others to use. Change-Id: I919dbfa807f696c38d409ca7206104a0fba1ae65 Reviewed-on: https://code.wireshark.org/review/12508 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Diffstat (limited to 'epan')
-rw-r--r--epan/expert.h2
-rw-r--r--epan/funnel.h2
-rw-r--r--epan/packet.c2
-rw-r--r--epan/packet.h9
-rw-r--r--epan/prefs.h2
-rw-r--r--epan/proto.h2
6 files changed, 8 insertions, 11 deletions
diff --git a/epan/expert.h b/epan/expert.h
index bf5fcdb1ee..7d331f9c42 100644
--- a/epan/expert.h
+++ b/epan/expert.h
@@ -179,7 +179,7 @@ void expert_deregister_expertinfo (const char *abbrev);
/**
* Deregister expert info from a protocol.
*/
-WS_DLL_PUBLIC void expert_deregister_protocol (expert_module_t *module);
+void expert_deregister_protocol (expert_module_t *module);
/**
* Free deregistered expert infos.
diff --git a/epan/funnel.h b/epan/funnel.h
index d7d00020e4..1d1c7365d7 100644
--- a/epan/funnel.h
+++ b/epan/funnel.h
@@ -110,7 +110,7 @@ WS_DLL_PUBLIC void funnel_register_menu(const char *name,
funnel_menu_callback callback,
gpointer callback_data,
gboolean retap);
-WS_DLL_PUBLIC void funnel_deregister_menus(void (*callback)(gpointer));
+void funnel_deregister_menus(void (*callback)(gpointer));
typedef void (*funnel_registration_cb_t)(const char *name,
register_stat_group_t group,
diff --git a/epan/packet.c b/epan/packet.c
index ba89b86d0f..0d810ee9a8 100644
--- a/epan/packet.c
+++ b/epan/packet.c
@@ -2606,7 +2606,7 @@ dissector_handle_t create_dissector_handle_with_name(new_dissector_t dissector,
}
/* Destroy an anonymous handle for a dissector. */
-void
+static void
destroy_dissector_handle(dissector_handle_t handle)
{
if (handle == NULL) return;
diff --git a/epan/packet.h b/epan/packet.h
index 998d307a58..4c04c4b119 100644
--- a/epan/packet.h
+++ b/epan/packet.h
@@ -212,7 +212,7 @@ WS_DLL_PUBLIC dissector_table_t register_custom_dissector_table(const char *name
const char *ui_name, GHashFunc hash_func, GEqualFunc key_equal_func, dissector_table_allow_e allow_dup);
/** Deregister the dissector table by table name. */
-WS_DLL_PUBLIC void deregister_dissector_table(const char *name);
+void deregister_dissector_table(const char *name);
/* Find a dissector table by table name. */
WS_DLL_PUBLIC dissector_table_t find_dissector_table(const char *name);
@@ -514,7 +514,7 @@ WS_DLL_PUBLIC void heur_dissector_delete(const char *name, heur_dissector_t diss
WS_DLL_PUBLIC dissector_handle_t register_dissector(const char *name, new_dissector_t dissector, const int proto);
/** Deregister a dissector. */
-WS_DLL_PUBLIC void deregister_dissector(const char *name);
+void deregister_dissector(const char *name);
/** Get the long name of the protocol for a dissector handle. */
extern const char *dissector_handle_get_long_name(const dissector_handle_t handle);
@@ -540,9 +540,6 @@ WS_DLL_PUBLIC dissector_handle_t create_dissector_handle(new_dissector_t dissect
WS_DLL_PUBLIC dissector_handle_t create_dissector_handle_with_name(new_dissector_t dissector,
const int proto, const char* name);
-/** Destroy an anonymous handle for a dissector. */
-WS_DLL_PUBLIC void destroy_dissector_handle(dissector_handle_t handle);
-
/** Call a dissector through a handle and if no dissector was found
* pass it over to the "data" dissector instead.
*
@@ -727,7 +724,7 @@ WS_DLL_PUBLIC void dissector_dump_heur_decodes(void);
* dissector has been called.
*/
WS_DLL_PUBLIC void register_postdissector(dissector_handle_t);
-WS_DLL_PUBLIC void deregister_postdissector(dissector_handle_t handle);
+void deregister_postdissector(dissector_handle_t handle);
extern gboolean have_postdissector(void);
extern void call_all_postdissectors(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
diff --git a/epan/prefs.h b/epan/prefs.h
index 8300c10670..ba097cd7ee 100644
--- a/epan/prefs.h
+++ b/epan/prefs.h
@@ -294,7 +294,7 @@ WS_DLL_PUBLIC module_t *prefs_register_protocol(int id, void (*apply_cb)(void));
/**
* Deregister preferences from a protocol.
*/
-WS_DLL_PUBLIC void prefs_deregister_protocol(int id);
+void prefs_deregister_protocol(int id);
/*
* Register that a statistical tap has preferences.
diff --git a/epan/proto.h b/epan/proto.h
index c6ce7ede21..8a3dd4968e 100644
--- a/epan/proto.h
+++ b/epan/proto.h
@@ -2013,7 +2013,7 @@ proto_register_protocol(const char *name, const char *short_name, const char *fi
/** Deregister a protocol.
@param short_name abbreviated name of the protocol
@return TRUE if protocol is removed */
-WS_DLL_PUBLIC gboolean
+gboolean
proto_deregister_protocol(const char *short_name);
/** This type of function can be registered to get called whenever