aboutsummaryrefslogtreecommitdiffstats
path: root/epan/wmem/wmem_miscutl.h
diff options
context:
space:
mode:
authorJoão Valverde <j@v6e.pt>2021-07-12 21:22:05 +0100
committerWireshark GitLab Utility <gerald+gitlab-utility@wireshark.org>2021-07-26 14:56:11 +0000
commit7f9c1f5f92c131354fc8b2b88d473706786064c0 (patch)
tree9249c0eda50dea18e8b85e8aeb8c1d3c98a007cb /epan/wmem/wmem_miscutl.h
parent8310665ae707b589e04167ef9bd2aed6f71651f3 (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_miscutl.h')
-rw-r--r--epan/wmem/wmem_miscutl.h70
1 files changed, 0 insertions, 70 deletions
diff --git a/epan/wmem/wmem_miscutl.h b/epan/wmem/wmem_miscutl.h
deleted file mode 100644
index ccf65f06d8..0000000000
--- a/epan/wmem/wmem_miscutl.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* wmem_miscutl.h
- * Definitions for the Wireshark Memory Manager Misc Utilities
- * Copyright 2013, Evan Huus <eapache@gmail.com>
- *
- * Wireshark - Network traffic analyzer
- * By Gerald Combs <gerald@wireshark.org>
- * Copyright 1998 Gerald Combs
- *
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-#ifndef __WMEM_MISCUTL_H__
-#define __WMEM_MISCUTL_H__
-
-#include <string.h>
-#include <glib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/** @addtogroup wmem
- * @{
- * @defgroup wmem-strutl String Utilities
- *
- * A collection of misc. utility functions for wmem.
- *
- * @{
- */
-
-/** Copies a block of memory.
- *
- * @param allocator The allocator object to use to allocate memory to copy into.
- * @param source The pointer to the memory block to copy.
- * @param size The amount of memory to copy.
- * @return The location of the memory copy or NULL if size is 0.
- */
-WS_DLL_PUBLIC
-void *
-wmem_memdup(wmem_allocator_t *allocator, const void *source, const size_t size)
-G_GNUC_MALLOC;
-
-/** Generic GCompareFunc implementation to compare unsigned integer 64 bits long
- */
-WS_DLL_PUBLIC
-gint
-uint64_compare(gconstpointer a, gconstpointer b);
-
-
-/** @}
- * @} */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __WMEM_MISCUTL_H__ */
-
-/*
- * Editor modelines - https://www.wireshark.org/tools/modelines.html
- *
- * Local variables:
- * c-basic-offset: 4
- * tab-width: 8
- * indent-tabs-mode: nil
- * End:
- *
- * vi: set shiftwidth=4 tabstop=8 expandtab:
- * :indentSize=4:tabSize=8:noTabs=true:
- */