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.

1 files changed, 0 insertions, 120 deletions

diff --git a/epan/wmem/wmem_strbuf.h b/epan/wmem/wmem_strbuf.h
deleted file mode 100644
index d2f4b3bb2e..0000000000
--- a/epan/wmem/wmem_strbuf.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* wmem_strbuf.h
- * Definitions for the Wireshark Memory Manager String Buffer
- * Copyright 2012, 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_STRBUF_H__
-#define __WMEM_STRBUF_H__
-
-#include <string.h>
-#include <glib.h>
-
-#include "wmem_core.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/** @addtogroup wmem
- *  @{
- *    @defgroup wmem-strbuf String Buffer
- *
- *    A string object implementation on top of wmem.
- *
- *    @{
- */
-
-struct _wmem_strbuf_t;
-
-typedef struct _wmem_strbuf_t wmem_strbuf_t;
-
-WS_DLL_PUBLIC
-wmem_strbuf_t *
-wmem_strbuf_sized_new(wmem_allocator_t *allocator,
-                      gsize alloc_len, gsize max_len)
-G_GNUC_MALLOC;
-
-#define wmem_strbuf_new_label(ALLOCATOR) \
-    wmem_strbuf_sized_new((ALLOCATOR), 0, ITEM_LABEL_LENGTH)
-
-WS_DLL_PUBLIC
-wmem_strbuf_t *
-wmem_strbuf_new(wmem_allocator_t *allocator, const gchar *str)
-G_GNUC_MALLOC;
-
-WS_DLL_PUBLIC
-void
-wmem_strbuf_append(wmem_strbuf_t *strbuf, const gchar *str);
-
-/* Appends up to append_len bytes (as allowed by strbuf->max_len) from
- * str. Ensures that strbuf is null terminated afterwards but will copy
- * embedded nulls. */
-WS_DLL_PUBLIC
-void
-wmem_strbuf_append_len(wmem_strbuf_t *strbuf, const gchar *str, gsize append_len);
-
-WS_DLL_PUBLIC
-void
-wmem_strbuf_append_printf(wmem_strbuf_t *strbuf, const gchar *format, ...)
-G_GNUC_PRINTF(2, 3);
-
-WS_DLL_PUBLIC
-void
-wmem_strbuf_append_vprintf(wmem_strbuf_t *strbuf, const gchar *fmt, va_list ap);
-
-WS_DLL_PUBLIC
-void
-wmem_strbuf_append_c(wmem_strbuf_t *strbuf, const gchar c);
-
-WS_DLL_PUBLIC
-void
-wmem_strbuf_append_unichar(wmem_strbuf_t *strbuf, const gunichar c);
-
-WS_DLL_PUBLIC
-void
-wmem_strbuf_truncate(wmem_strbuf_t *strbuf, const gsize len);
-
-WS_DLL_PUBLIC
-const gchar *
-wmem_strbuf_get_str(wmem_strbuf_t *strbuf);
-
-WS_DLL_PUBLIC
-gsize
-wmem_strbuf_get_len(wmem_strbuf_t *strbuf);
-
-/** Truncates the allocated memory down to the minimal amount, frees the header
- *  structure, and returns a non-const pointer to the raw string. The
- *  wmem_strbuf_t structure cannot be used after this is called. Basically a
- *  destructor for when you still need the underlying C-string.
- */
-WS_DLL_PUBLIC
-char *
-wmem_strbuf_finalize(wmem_strbuf_t *strbuf);
-
-/**   @}
- *  @} */
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __WMEM_STRBUF_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:
- */