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>

7 files changed, 8 insertions, 19 deletions

diff --git a/debian/libwireshark0.symbols b/debian/libwireshark0.symbols
index 91244683c7..cba142bbde 100644
--- a/debian/libwireshark0.symbols
+++ b/debian/libwireshark0.symbols
@@ -240,10 +240,6 @@ libwireshark.so.0 libwireshark0 #MINVER#
  decode_tcp_ports@Base 1.99.0
  decode_udp_ports@Base 1.99.0
  delete_itu_tcap_subdissector@Base 1.9.1
- deregister_dissector@Base 1.99.9
- deregister_dissector_table@Base 1.99.9
- deregister_postdissector@Base 1.99.9
- destroy_dissector_handle@Base 1.99.9
  destroy_print_stream@Base 1.12.0~rc1
  dfilter_apply_edt@Base 1.9.1
  dfilter_compile@Base 1.9.1
@@ -524,7 +520,6 @@ libwireshark.so.0 libwireshark0 #MINVER#
  expert_add_info@Base 1.12.0~rc1
  expert_add_info_format@Base 1.9.1
  expert_checksum_vals@Base 1.12.0~rc1
- expert_deregister_protocol@Base 1.99.9
  expert_get_highest_severity@Base 1.9.1
  expert_get_summary@Base 1.99.10
  expert_group_vals@Base 1.12.0~rc1
@@ -605,7 +600,6 @@ libwireshark.so.0 libwireshark0 #MINVER#
  ftype_can_slice@Base 1.9.1
  ftype_name@Base 1.9.1
  ftype_pretty_name@Base 1.9.1
- funnel_deregister_menus@Base 1.99.9
  funnel_get_funnel_ops@Base 1.9.1
  funnel_register_all_menus@Base 1.9.1
  funnel_register_menu@Base 1.9.1
@@ -892,7 +886,6 @@ libwireshark.so.0 libwireshark0 #MINVER#
  prefs_capture_device_monitor_mode@Base 1.9.1
  prefs_capture_options_dialog_column_is_visible@Base 1.9.1
  prefs_clear_string_list@Base 1.9.1
- prefs_deregister_protocol@Base 1.99.9
  prefs_find_module@Base 1.9.1
  prefs_find_preference@Base 1.9.1
  prefs_get_string_list@Base 1.9.1
@@ -943,7 +936,6 @@ libwireshark.so.0 libwireshark0 #MINVER#
  proto_check_field_name@Base 1.9.1
  proto_construct_match_selected_string@Base 1.9.1
  proto_deregister_field@Base 1.99.9
- proto_deregister_protocol@Base 1.99.9
  proto_disable_proto_by_name@Base 1.99.8
  proto_enable_all@Base 1.9.1
  proto_enable_heuristic_by_name@Base 1.99.8
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