diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-10-10 19:05:30 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-10-10 19:05:30 +0000 |
| commit | f68020f1e160200583881aa79e312fe8a8b93e0d (patch) | |
| tree | 942b0b8329edb124932f2867cd2510722f27dc17 /epan/emem.h | |
| parent | dbca2e7d8fbb3abd8101911df8468701b71e2061 (diff) | |
Revert changes to ep_ allocator, revert edt ref-counting.
svn path=/trunk/; revision=45451
Diffstat (limited to 'epan/emem.h')
| -rw-r--r-- | epan/emem.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/epan/emem.h b/epan/emem.h index a338ac5839..e3b5f37c6f 100644 --- a/epan/emem.h +++ b/epan/emem.h @@ -34,8 +34,6 @@ */ void emem_init(void); -typedef struct _emem_pool_t emem_pool_t; - /* Functions for handling memory allocation and garbage collection with * a packet lifetime scope. * These functions are used to allocate memory that will only remain persistent @@ -48,9 +46,6 @@ typedef struct _emem_pool_t emem_pool_t; * the previous packet is freed. */ -emem_pool_t *ep_create_pool(void); -void ep_free_pool(emem_pool_t *ep_packet_mem); - /** Allocate memory with a packet lifetime scope */ void *ep_alloc(size_t size) G_GNUC_MALLOC; #define ep_new(type) ((type*)ep_alloc(sizeof(type))) @@ -92,6 +87,9 @@ gchar *ep_strconcat(const gchar *string, ...) G_GNUC_MALLOC G_GNUC_NULL_TERMINAT */ gchar** ep_strsplit(const gchar* string, const gchar* delimiter, int max_tokens); +/** release all memory allocated in the previous packet dissection */ +void ep_free_all(void); + /** a stack implemented using ephemeral allocators */ |