diff options
| author | João Valverde <j@v6e.pt> | 2021-07-12 21:22:05 +0100 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-07-26 14:56:11 +0000 |
| commit | 7f9c1f5f92c131354fc8b2b88d473706786064c0 (patch) | |
| tree | 9249c0eda50dea18e8b85e8aeb8c1d3c98a007cb /epan/wmem/wmem.h | |
| parent | 8310665ae707b589e04167ef9bd2aed6f71651f3 (diff) | |
Move wmem to wsutil
This allows wmem to be used from other libraries, namely wsutil.
It is often the case that a funtion exists in wsutil and cannot
be used with a wmem scope, requiring some code duplication or
extra memory allocations, or vice-versa, code in epan cannot be
moved to wsutil because it has a wmem dependency.
To this end wmem is moved to wsutil. Scope management remains part
of epan because those scope semantics are specific to dissection.
Diffstat (limited to 'epan/wmem/wmem.h')
| -rw-r--r-- | epan/wmem/wmem.h | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/epan/wmem/wmem.h b/epan/wmem/wmem.h index 2827301a6d..e09dd2a518 100644 --- a/epan/wmem/wmem.h +++ b/epan/wmem/wmem.h @@ -1,5 +1,5 @@ /* wmem.h - * Definitions for the Wireshark Memory Manager + * Definitions for the EPAN Memory Manager scopes * Copyright 2012, Evan Huus <eapache@gmail.com> * * Wireshark - Network traffic analyzer @@ -9,24 +9,12 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef __WMEM_H__ -#define __WMEM_H__ +#ifndef __EPAN_WMEM_H__ +#define __EPAN_WMEM_H__ -#include "wmem_array.h" -#include "wmem_core.h" -#include "wmem_list.h" -#include "wmem_map.h" -#include "wmem_miscutl.h" -#include "wmem_queue.h" #include "wmem_scopes.h" -#include "wmem_stack.h" -#include "wmem_strbuf.h" -#include "wmem_strutl.h" -#include "wmem_tree.h" -#include "wmem_interval_tree.h" -#include "wmem_user_cb.h" -#endif /* __WMEM_H__ */ +#endif /* __EPAN_WMEM_H__ */ /* * Editor modelines - https://www.wireshark.org/tools/modelines.html |