Pull the code to save enabled/disabled lists into libwireshark.

It's identical in the GTK+ and Qt UIs, and it should just be done in
libwireshark.

Rename some routines to just speak of enabled_and_disabled_lists, so we
don't have to say enabled_and_disabled_protos_and_heuristic_dissectors
or something such as that.

Clean up indentation.

Change-Id: Ief2e612d9e1b60d8d0123b6bd3409dce5faf6495
Reviewed-on: https://code.wireshark.org/review/20970
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 9 insertions, 37 deletions

diff --git a/epan/disabled_protos.h b/epan/disabled_protos.h
index f1f436464f..03da425729 100644
--- a/epan/disabled_protos.h
+++ b/epan/disabled_protos.h
@@ -29,36 +29,12 @@ extern "C" {
 #endif /* __cplusplus */
 
 /*
- * Write out a list of disabled protocols.
- *
- * On success, "*pref_path_return" is set to NULL.
- * On error, "*pref_path_return" is set to point to the pathname of
- * the file we tried to read - it should be freed by our caller -
- * and "*errno_return" is set to the error.
- */
-WS_DLL_PUBLIC void
-save_disabled_protos_list(char **pref_path_return, int *errno_return);
-
-/*
  * Disable a particular protocol by name
  */
-
 WS_DLL_PUBLIC void
 proto_disable_proto_by_name(const char *name);
 
 /*
- * Write out a list of enabled protocols (that default to being disabled)
- *
- * On success, "*pref_path_return" is set to NULL.
- * On error, "*pref_path_return" is set to point to the pathname of
- * the file we tried to read - it should be freed by our caller -
- * and "*errno_return" is set to the error.
- */
-WS_DLL_PUBLIC void
-save_enabled_protos_list(char **pref_path_return, int *errno_return);
-
-
-/*
  * Enable a particular protocol by name.  This will only enable
  * protocols that are disabled by default.  All others will be ignored.
  */
@@ -66,17 +42,6 @@ WS_DLL_PUBLIC void
 proto_enable_proto_by_name(const char *name);
 
 /*
- * Write out a list of disabled heuristic dissectors.
- *
- * On success, "*pref_path_return" is set to NULL.
- * On error, "*pref_path_return" is set to point to the pathname of
- * the file we tried to read - it should be freed by our caller -
- * and "*errno_return" is set to the error.
- */
-WS_DLL_PUBLIC void
-save_disabled_heur_dissector_list(char **pref_path_return, int *errno_return);
-
-/*
  * Enable/disable a particular heuristic dissector by name
  * On success (found the protocol), return TRUE.
  * On failure (didn't find the protocol), return FALSE.
@@ -89,13 +54,20 @@ proto_enable_heuristic_by_name(const char *name, gboolean enable);
  * dissectors.  Report errors through the UI.
  */
 WS_DLL_PUBLIC void
-read_enabled_and_disabled_protos(void);
+read_enabled_and_disabled_lists(void);
+
+/*
+ * Write out the lists of enabled and disabled protocols and heuristic
+ * dissectors to the corresponding files.  Report errors through the UI.
+ */
+WS_DLL_PUBLIC void
+save_enabled_and_disabled_lists(void);
 
 /*
  * Free the internal structures
  */
 extern void
-enabled_and_disabled_protos_cleanup(void);
+cleanup_enabled_and_disabled_lists(void);
 
 #ifdef __cplusplus
 }