aboutsummaryrefslogtreecommitdiffstats
path: root/epan/export_object.h
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2017-02-07 19:44:19 -0500
committerMichael Mann <mmann78@netscape.net>2017-02-08 14:24:28 +0000
commit243c09fa06bf7646b577e2baf024106432ec1bd9 (patch)
tree7e0385427dd99477b9d8fdc262d2d52c67ee402e /epan/export_object.h
parent64a00dc0a81f13d033cc1e7f532a99cdda14cca8 (diff)
Switch export objects to use wmem_tree_t instead of (sorted) GSList.
Change-Id: Iaaa7b44954337c7857dbb541b727924e2de57c9d Reviewed-on: https://code.wireshark.org/review/20016 Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/export_object.h')
-rw-r--r--epan/export_object.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/epan/export_object.h b/epan/export_object.h
index 475b1d8f0d..1e0e25e174 100644
--- a/epan/export_object.h
+++ b/epan/export_object.h
@@ -24,6 +24,7 @@
#define __EXPORT_OBJECT_H__
#include "tap.h"
+#include "wmem/wmem.h"
#ifdef __cplusplus
extern "C" {
@@ -111,7 +112,7 @@ WS_DLL_PUBLIC register_eo_t* get_eo_by_name(const char* name);
* @param func action to be performed on all Export Objects
* @param user_data any data needed to help perform function
*/
-WS_DLL_PUBLIC void eo_iterate_tables(GFunc func, gpointer user_data);
+WS_DLL_PUBLIC void eo_iterate_tables(wmem_foreach_func func, gpointer user_data);
/** Find all disallowed characters/bytes and replace them with %xx
*
@@ -135,10 +136,6 @@ WS_DLL_PUBLIC const char *eo_ct2ext(const char *content_type);
*/
WS_DLL_PUBLIC void eo_free_entry(export_object_entry_t *entry);
-/** Free the export objects table
- */
-extern void export_object_cleanup(void);
-
#ifdef __cplusplus
}
#endif /* __cplusplus */