diff options
| author | João Valverde <j@v6e.pt> | 2021-12-27 19:52:12 +0000 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2021-12-27 21:16:05 +0000 |
| commit | a0f1ffec7165687c8f7ca9e10db5d0e4be015069 (patch) | |
| tree | 6e60a45a739741c539d2e8447b5ede49c91b8b33 | |
| parent | 318bbfce60eef3653c525ac06e075d611a467997 (diff) | |
epan: Remove obsolete header "garrayfix.h"
| -rw-r--r-- | epan/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-xml.c | 5 | ||||
| -rw-r--r-- | epan/garrayfix.h | 25 |
3 files changed, 2 insertions, 29 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index 224fd7bb23..8eb0f846e9 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -92,7 +92,6 @@ set(LIBWIRESHARK_PUBLIC_HEADERS frame_data.h frame_data_sequence.h funnel.h - garrayfix.h #geoip_db.h golay.h guid-utils.h diff --git a/epan/dissectors/packet-xml.c b/epan/dissectors/packet-xml.c index 073e80e806..72c561d2cc 100644 --- a/epan/dissectors/packet-xml.c +++ b/epan/dissectors/packet-xml.c @@ -25,7 +25,6 @@ #include <wsutil/filesystem.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/garrayfix.h> #include <wsutil/str_util.h> #include <wsutil/report_message.h> @@ -1321,7 +1320,7 @@ static void register_dtd(dtd_build_data_t *dtd_data, GString *errors) root_element->hf_tag = proto_register_protocol(full_name, short_name, short_name); proto_register_field_array(root_element->hf_tag, (hf_register_info*)wmem_array_get_raw(hfs), wmem_array_get_count(hfs)); - proto_register_subtree_array((gint **)g_array_data(etts), etts->len); + proto_register_subtree_array((gint **)etts->data, etts->len); if (dtd_data->media_type) { gchar* media_type = wmem_strdup(wmem_epan_scope(), dtd_data->media_type); @@ -1511,7 +1510,7 @@ proto_register_xml(void) xml_ns.hf_tag = proto_register_protocol("eXtensible Markup Language", "XML", xml_ns.name); proto_register_field_array(xml_ns.hf_tag, (hf_register_info*)wmem_array_get_raw(hf_arr), wmem_array_get_count(hf_arr)); - proto_register_subtree_array((gint **)g_array_data(ett_arr), ett_arr->len); + proto_register_subtree_array((gint **)ett_arr->data, ett_arr->len); expert_xml = expert_register_protocol(xml_ns.hf_tag); expert_register_field_array(expert_xml, ei, array_length(ei)); diff --git a/epan/garrayfix.h b/epan/garrayfix.h deleted file mode 100644 index f5535932fa..0000000000 --- a/epan/garrayfix.h +++ /dev/null @@ -1,25 +0,0 @@ -/** @file - * - * Macros to work around the "data" field of a GArray having type guint8 *, - * rather than void *, so that, even though the GArray code should be - * ensuring that the data is aligned strictly enough for any data type, - * we still get warnings with -Wcast-align. - * - * Wireshark - Network traffic analyzer - * By Gerald Combs <gerald@wireshark.org> - * Copyright 2007 Gerald Combs - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#ifndef __GARRAYFIX_H__ -#define __GARRAYFIX_H__ - -#ifdef g_array_index -#undef g_array_index -#define g_array_index(a,t,i) (((t*) (void*) (a)->data) [(i)]) -#endif - -#define g_array_data(a) ((void*) (a)->data) - -#endif /* __GARRAYFIX_H__ */ |