diff options
Diffstat (limited to 'epan')
91 files changed, 89 insertions, 119 deletions
diff --git a/epan/CMakeLists.txt b/epan/CMakeLists.txt index b8f00f352c..9ad24361e7 100644 --- a/epan/CMakeLists.txt +++ b/epan/CMakeLists.txt @@ -160,8 +160,7 @@ set(LIBWIRESHARK_PUBLIC_HEADERS uat-int.h unit_strings.h value_string.h - wmem/wmem.h - wmem/wmem_scopes.h + wmem_scopes.h x264_prt_id.h xdlc.h ) @@ -259,7 +258,7 @@ set(LIBWIRESHARK_NONGENERATED_FILES uat.c value_string.c unit_strings.c - wmem/wmem_scopes.c + wmem_scopes.c xdlc.c protobuf-helper.c protobuf_lang_tree.c diff --git a/epan/address.h b/epan/address.h index 99f39b4686..993bdb4566 100644 --- a/epan/address.h +++ b/epan/address.h @@ -15,7 +15,7 @@ #include <string.h> /* for memcmp */ #include "tvbuff.h" -#include "wmem/wmem.h" +#include <epan/wmem_scopes.h> #include <wsutil/ws_assert.h> #ifdef __cplusplus diff --git a/epan/charsets.c b/epan/charsets.c index 415b120b48..aa3d519f07 100644 --- a/epan/charsets.c +++ b/epan/charsets.c @@ -14,7 +14,7 @@ #include <glib.h> #include <epan/proto.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <wsutil/pint.h> #include <wsutil/unicode-utils.h> diff --git a/epan/conversation.h b/epan/conversation.h index fc6fc4f0be..2c158261cd 100644 --- a/epan/conversation.h +++ b/epan/conversation.h @@ -14,6 +14,7 @@ #include "ws_symbol_export.h" #include "packet.h" /* for conversation dissector type */ +#include <epan/wmem_scopes.h> #ifdef __cplusplus extern "C" { diff --git a/epan/conversation_table.h b/epan/conversation_table.h index c15394ac4c..85e81eeee1 100644 --- a/epan/conversation_table.h +++ b/epan/conversation_table.h @@ -15,7 +15,7 @@ #include "conv_id.h" #include "tap.h" #include "conversation.h" -#include "wmem/wmem.h" +#include <epan/wmem_scopes.h> #ifdef __cplusplus extern "C" { diff --git a/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.h b/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.h index 85866b36d2..872403f8f5 100644 --- a/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.h +++ b/epan/dissectors/asn1/atn-ulcs/packet-atn-ulcs-template.h @@ -12,7 +12,7 @@ #include "packet.h" -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> enum msg_type { um, diff --git a/epan/dissectors/file-blf.c b/epan/dissectors/file-blf.c index d8c32c5c4a..8ddac2c64b 100644 --- a/epan/dissectors/file-blf.c +++ b/epan/dissectors/file-blf.c @@ -25,7 +25,7 @@ #include <epan/expert.h> #include <epan/exceptions.h> #include <epan/show_exception.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <wiretap/blf.h> static int proto_blf = -1; diff --git a/epan/dissectors/file-btsnoop.c b/epan/dissectors/file-btsnoop.c index d584b40f29..ae7eac5774 100644 --- a/epan/dissectors/file-btsnoop.c +++ b/epan/dissectors/file-btsnoop.c @@ -15,7 +15,7 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <wiretap/wtap.h> diff --git a/epan/dissectors/file-pcap.c b/epan/dissectors/file-pcap.c index c0e5a704ae..fb3b8eaeb7 100644 --- a/epan/dissectors/file-pcap.c +++ b/epan/dissectors/file-pcap.c @@ -18,7 +18,7 @@ #include <epan/expert.h> #include <epan/exceptions.h> #include <epan/show_exception.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/dissectors/packet-pcap_pktdata.h> diff --git a/epan/dissectors/file-pcapng.c b/epan/dissectors/file-pcapng.c index 06f384db45..2c74084881 100644 --- a/epan/dissectors/file-pcapng.c +++ b/epan/dissectors/file-pcapng.c @@ -19,7 +19,7 @@ #include <epan/exceptions.h> #include <epan/show_exception.h> #include <epan/addr_resolv.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <wiretap/secrets-types.h> #include <epan/dissectors/packet-pcap_pktdata.h> diff --git a/epan/dissectors/packet-atn-ulcs.h b/epan/dissectors/packet-atn-ulcs.h index 9b29728197..bf46344735 100644 --- a/epan/dissectors/packet-atn-ulcs.h +++ b/epan/dissectors/packet-atn-ulcs.h @@ -20,7 +20,7 @@ #include "packet.h" -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> enum msg_type { um, diff --git a/epan/dissectors/packet-bluetooth.h b/epan/dissectors/packet-bluetooth.h index 245fb06f8b..03915459f8 100644 --- a/epan/dissectors/packet-bluetooth.h +++ b/epan/dissectors/packet-bluetooth.h @@ -10,7 +10,7 @@ #ifndef __PACKET_BLUETOOTH_H__ #define __PACKET_BLUETOOTH_H__ -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include "packet-usb.h" #include "packet-ubertooth.h" diff --git a/epan/dissectors/packet-c15ch.c b/epan/dissectors/packet-c15ch.c index 7def4e54b1..7ca2c7a8ff 100644 --- a/epan/dissectors/packet-c15ch.c +++ b/epan/dissectors/packet-c15ch.c @@ -13,7 +13,7 @@ #include <epan/packet.h> #include <epan/etypes.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> void proto_register_c15ch_hbeat(void); void proto_register_c15ch(void); diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c index 0659c0ba4f..97686e4d45 100644 --- a/epan/dissectors/packet-cip.c +++ b/epan/dissectors/packet-cip.c @@ -39,7 +39,7 @@ #include <epan/expert.h> #include <epan/prefs.h> #include <epan/proto_data.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include "packet-cip.h" #include "packet-cipmotion.h" #include "packet-cipsafety.h" diff --git a/epan/dissectors/packet-coap.c b/epan/dissectors/packet-coap.c index db09db683f..3d8815d342 100644 --- a/epan/dissectors/packet-coap.c +++ b/epan/dissectors/packet-coap.c @@ -28,7 +28,7 @@ #include <epan/reassemble.h> #include <epan/proto_data.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/to_str.h> #include "packet-dtls.h" #include "packet-coap.h" diff --git a/epan/dissectors/packet-cql.c b/epan/dissectors/packet-cql.c index cf28037ab0..954e0b9632 100644 --- a/epan/dissectors/packet-cql.c +++ b/epan/dissectors/packet-cql.c @@ -17,7 +17,7 @@ #include <epan/conversation.h> #include <epan/packet.h> #include <epan/dissectors/packet-tcp.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/expert.h> #include <epan/to_str.h> #include <epan/addr_resolv.h> diff --git a/epan/dissectors/packet-epl-profile-parser.c b/epan/dissectors/packet-epl-profile-parser.c index 6168685cc5..c7c6e22cad 100644 --- a/epan/dissectors/packet-epl-profile-parser.c +++ b/epan/dissectors/packet-epl-profile-parser.c @@ -30,7 +30,7 @@ #include <wsutil/strtoi.h> #include <wsutil/str_util.h> #include <wsutil/wslog.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #if defined HAVE_LIBXML2 #include <libxml/xmlversion.h> diff --git a/epan/dissectors/packet-epl.h b/epan/dissectors/packet-epl.h index 4ca2a1d55c..fd145acf3c 100644 --- a/epan/dissectors/packet-epl.h +++ b/epan/dissectors/packet-epl.h @@ -15,7 +15,7 @@ #include <glib.h> #include <epan/address.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/range.h> struct epl_datatype; diff --git a/epan/dissectors/packet-frame.c b/epan/dissectors/packet-frame.c index b8516e8a99..98dbf7114f 100644 --- a/epan/dissectors/packet-frame.c +++ b/epan/dissectors/packet-frame.c @@ -33,7 +33,7 @@ #include <wsutil/ws_assert.h> #include <epan/proto_data.h> #include <epan/addr_resolv.h> -#include <wmem/wmem.h> +#include <epan/wmem_scopes.h> #include "packet-frame.h" #include "packet-icmp.h" diff --git a/epan/dissectors/packet-hpfeeds.c b/epan/dissectors/packet-hpfeeds.c index 47a269829c..6f60998afa 100644 --- a/epan/dissectors/packet-hpfeeds.c +++ b/epan/dissectors/packet-hpfeeds.c @@ -22,7 +22,7 @@ #include <epan/expert.h> #include <epan/tap.h> #include <epan/stats_tree.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index 32ff564232..aecd3034f5 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -19,7 +19,7 @@ #include <epan/strutil.h> #include <epan/to_str.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include "packet-http.h" #include <stdio.h> diff --git a/epan/dissectors/packet-ippusb.c b/epan/dissectors/packet-ippusb.c index 655ae20e3a..15aae1b8e6 100644 --- a/epan/dissectors/packet-ippusb.c +++ b/epan/dissectors/packet-ippusb.c @@ -21,7 +21,7 @@ #include <epan/strutil.h> #include <epan/to_str.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <reassemble.h> #include <packet-usb.h> diff --git a/epan/dissectors/packet-iso8583.c b/epan/dissectors/packet-iso8583.c index bc6bb3328b..e1e6b14b32 100644 --- a/epan/dissectors/packet-iso8583.c +++ b/epan/dissectors/packet-iso8583.c @@ -23,7 +23,7 @@ #include <epan/packet.h> #include <epan/expert.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/dissectors/packet-tcp.h> #include <wsutil/strtoi.h> diff --git a/epan/dissectors/packet-isobus.c b/epan/dissectors/packet-isobus.c index 6df5499928..c224c1c652 100644 --- a/epan/dissectors/packet-isobus.c +++ b/epan/dissectors/packet-isobus.c @@ -15,7 +15,7 @@ #include <epan/packet.h> #include <epan/reassemble.h> #include <epan/dissectors/packet-socketcan.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> void proto_register_isobus(void); void proto_reg_handoff_isobus(void); diff --git a/epan/dissectors/packet-jdwp.c b/epan/dissectors/packet-jdwp.c index b88ced60d5..28ae82a6b3 100644 --- a/epan/dissectors/packet-jdwp.c +++ b/epan/dissectors/packet-jdwp.c @@ -18,7 +18,7 @@ #include <epan/expert.h> #include <epan/to_str.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include "packet-tcp.h" diff --git a/epan/dissectors/packet-knxip_decrypt.c b/epan/dissectors/packet-knxip_decrypt.c index 24d4f3631c..ccf93b0be7 100644 --- a/epan/dissectors/packet-knxip_decrypt.c +++ b/epan/dissectors/packet-knxip_decrypt.c @@ -14,7 +14,7 @@ #include <wsutil/file_util.h> #include "proto.h" #include "packet-knxip_decrypt.h" -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <wsutil/wsgcrypt.h> #include <wsutil/strtoi.h> #include <wsutil/wslog.h> diff --git a/epan/dissectors/packet-lldp.c b/epan/dissectors/packet-lldp.c index bc52fe235d..94d7ca441a 100644 --- a/epan/dissectors/packet-lldp.c +++ b/epan/dissectors/packet-lldp.c @@ -36,7 +36,7 @@ #include <epan/addr_resolv.h> #include <epan/expert.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/oui.h> diff --git a/epan/dissectors/packet-mle.c b/epan/dissectors/packet-mle.c index 714b08cbba..790e7de829 100644 --- a/epan/dissectors/packet-mle.c +++ b/epan/dissectors/packet-mle.c @@ -24,7 +24,7 @@ #include <epan/packet.h> #include <epan/conversation.h> #include <epan/proto_data.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/expert.h> #include <epan/prefs.h> #include <epan/strutil.h> diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 3d65c3ea14..12ba9221d9 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -19,7 +19,7 @@ #include <epan/expert.h> #include <epan/strutil.h> #include <epan/proto_data.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include "packet-ipx.h" #include "packet-tcp.h" diff --git a/epan/dissectors/packet-nfapi.c b/epan/dissectors/packet-nfapi.c index e48fc35d76..333aff0fb0 100644 --- a/epan/dissectors/packet-nfapi.c +++ b/epan/dissectors/packet-nfapi.c @@ -19,7 +19,7 @@ #include <epan/exceptions.h> #include <epan/expert.h> #include <epan/reassemble.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <ptvcursor.h> diff --git a/epan/dissectors/packet-raknet.c b/epan/dissectors/packet-raknet.c index df5d198f56..9a4019941d 100644 --- a/epan/dissectors/packet-raknet.c +++ b/epan/dissectors/packet-raknet.c @@ -22,7 +22,7 @@ #include <epan/packet.h> #include <epan/reassemble.h> #include <epan/to_str.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include "packet-raknet.h" diff --git a/epan/dissectors/packet-rtitcp.c b/epan/dissectors/packet-rtitcp.c index 120ea96350..3864e26fa3 100644 --- a/epan/dissectors/packet-rtitcp.c +++ b/epan/dissectors/packet-rtitcp.c @@ -22,7 +22,7 @@ #include <epan/expert.h> #include <epan/prefs.h> #include <epan/addr_resolv.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/conversation.h> #include <epan/dissectors/packet-tcp.h> diff --git a/epan/dissectors/packet-rtps-processed.c b/epan/dissectors/packet-rtps-processed.c index 92af5b1dce..4e23ee0e8f 100644 --- a/epan/dissectors/packet-rtps-processed.c +++ b/epan/dissectors/packet-rtps-processed.c @@ -59,7 +59,7 @@ #include <epan/expert.h> #include <epan/prefs.h> #include <epan/addr_resolv.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/conversation.h> #include <epan/column.h> #include <epan/dissectors/packet-tcp.h> diff --git a/epan/dissectors/packet-rtps-virtual-transport.c b/epan/dissectors/packet-rtps-virtual-transport.c index 107b133506..2ceb294189 100644 --- a/epan/dissectors/packet-rtps-virtual-transport.c +++ b/epan/dissectors/packet-rtps-virtual-transport.c @@ -59,7 +59,7 @@ #include <epan/expert.h> #include <epan/prefs.h> #include <epan/addr_resolv.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/conversation.h> #include <epan/column.h> #include <epan/dissectors/packet-tcp.h> diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index 1c4fd20f5e..8eaae2d5ca 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -36,7 +36,7 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/to_str.h> #include <epan/reassemble.h> #include <epan/tap.h> diff --git a/epan/dissectors/packet-skinny.c.in b/epan/dissectors/packet-skinny.c.in index 8ce184cdaf..c2c07fd45f 100644 --- a/epan/dissectors/packet-skinny.c.in +++ b/epan/dissectors/packet-skinny.c.in @@ -48,7 +48,7 @@ cog.out(' */\n') #include <epan/packet.h> #include <epan/prefs.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/to_str.h> #include <epan/reassemble.h> #include <epan/tap.h> diff --git a/epan/dissectors/packet-skinny.h b/epan/dissectors/packet-skinny.h index 7fee1eb5fa..779154b7c9 100644 --- a/epan/dissectors/packet-skinny.h +++ b/epan/dissectors/packet-skinny.h @@ -25,7 +25,7 @@ * cog.py -D xmlfile=tools/SkinnyProtocolOptimized.xml -d -c -o epan/dissectors/packet-skinny.h epan/dissectors/packet-skinny.h.in */ -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> /* request response tracking */ typedef struct _skinny_req_resp_t { diff --git a/epan/dissectors/packet-skinny.h.in b/epan/dissectors/packet-skinny.h.in index ab6676f57b..0c336e1876 100644 --- a/epan/dissectors/packet-skinny.h.in +++ b/epan/dissectors/packet-skinny.h.in @@ -37,7 +37,7 @@ cog.out(' */\n') /*]]]*/ /*[[[end]]]*/ -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> /* request response tracking */ typedef struct _skinny_req_resp_t { diff --git a/epan/dissectors/packet-smb.h b/epan/dissectors/packet-smb.h index 8246638619..a1cfed6a81 100644 --- a/epan/dissectors/packet-smb.h +++ b/epan/dissectors/packet-smb.h @@ -15,7 +15,7 @@ #include "ws_symbol_export.h" #include <epan/proto.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> WS_DLL_PUBLIC gboolean sid_name_snooping; diff --git a/epan/dissectors/packet-snort.c b/epan/dissectors/packet-snort.c index ddff5d14d3..86dd0a3e97 100644 --- a/epan/dissectors/packet-snort.c +++ b/epan/dissectors/packet-snort.c @@ -37,7 +37,7 @@ #include <epan/packet.h> #include <epan/prefs.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <wsutil/file_util.h> #include <wsutil/report_message.h> #include <wiretap/wtap-int.h> diff --git a/epan/dissectors/packet-ssyncp.c b/epan/dissectors/packet-ssyncp.c index 2eafa63e49..dbd0100520 100644 --- a/epan/dissectors/packet-ssyncp.c +++ b/epan/dissectors/packet-ssyncp.c @@ -32,7 +32,7 @@ #include <epan/packet.h> /* Should be first Wireshark include (other than config.h) */ #include <epan/conversation.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/proto_data.h> #include <epan/prefs.h> #include <epan/expert.h> diff --git a/epan/dissectors/packet-tcp.h b/epan/dissectors/packet-tcp.h index 5c7364ad4b..043d398a29 100644 --- a/epan/dissectors/packet-tcp.h +++ b/epan/dissectors/packet-tcp.h @@ -13,7 +13,7 @@ #include "ws_symbol_export.h" #include <epan/conversation.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #ifdef __cplusplus extern "C" { diff --git a/epan/dissectors/packet-thread.c b/epan/dissectors/packet-thread.c index 17445f8451..cbfcc8d365 100644 --- a/epan/dissectors/packet-thread.c +++ b/epan/dissectors/packet-thread.c @@ -16,7 +16,7 @@ #include <epan/packet.h> #include <epan/conversation.h> #include <epan/proto_data.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/expert.h> #include <epan/range.h> #include <epan/prefs.h> diff --git a/epan/dissectors/packet-tls-utils.h b/epan/dissectors/packet-tls-utils.h index 699658245b..ca6cc0a977 100644 --- a/epan/dissectors/packet-tls-utils.h +++ b/epan/dissectors/packet-tls-utils.h @@ -17,7 +17,7 @@ #include <glib.h> #include <epan/packet.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/expert.h> #include <epan/conversation.h> #include <epan/unit_strings.h> diff --git a/epan/dissectors/packet-tplink-smarthome.c b/epan/dissectors/packet-tplink-smarthome.c index 3a1392a0bc..e8e0a7f45d 100644 --- a/epan/dissectors/packet-tplink-smarthome.c +++ b/epan/dissectors/packet-tplink-smarthome.c @@ -32,7 +32,7 @@ #include <config.h> #include <epan/packet.h> #include <epan/address.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include "packet-tcp.h" #define TPLINK_SMARTHOME_PORT 9999 /* TP-Link Smart Home devices use this port on both TCP and UDP */ diff --git a/epan/dissectors/packet-tpm20.c b/epan/dissectors/packet-tpm20.c index 9a55101211..f4e665f6eb 100644 --- a/epan/dissectors/packet-tpm20.c +++ b/epan/dissectors/packet-tpm20.c @@ -15,7 +15,7 @@ #include <epan/to_str.h> #include <epan/tvbuff.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> typedef struct { guint32 com_pnum; diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c index 6f9c0b49ea..7c05f79281 100644 --- a/epan/dissectors/packet-tpncp.c +++ b/epan/dissectors/packet-tpncp.c @@ -23,7 +23,7 @@ #include <wsutil/file_util.h> #include <wsutil/report_message.h> #include <wsutil/strtoi.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include "packet-acdr.h" #include "packet-tcp.h" diff --git a/epan/dissectors/packet-udt.c b/epan/dissectors/packet-udt.c index c746e91a68..eee8a8369d 100644 --- a/epan/dissectors/packet-udt.c +++ b/epan/dissectors/packet-udt.c @@ -20,7 +20,7 @@ #include <epan/packet.h> #include <epan/conversation.h> #include <epan/expert.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> /* * Per-conversation information diff --git a/epan/dissectors/packet-usb.h b/epan/dissectors/packet-usb.h index a652c4adb9..6ab2d0fd4b 100644 --- a/epan/dissectors/packet-usb.h +++ b/epan/dissectors/packet-usb.h @@ -11,7 +11,7 @@ #define __PACKET_USB_H__ #include <epan/value_string.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/conversation.h> typedef struct _usb_address_t { diff --git a/epan/dissectors/packet-woww.c b/epan/dissectors/packet-woww.c index 2363dbb4d8..d3078e9a86 100644 --- a/epan/dissectors/packet-woww.c +++ b/epan/dissectors/packet-woww.c @@ -55,7 +55,7 @@ #include <config.h> #include <epan/packet.h> #include <epan/conversation.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> void proto_reg_handoff_woww(void); void proto_register_woww(void); diff --git a/epan/dissectors/packet-xmpp-utils.h b/epan/dissectors/packet-xmpp-utils.h index 66359125f3..8a8b301239 100644 --- a/epan/dissectors/packet-xmpp-utils.h +++ b/epan/dissectors/packet-xmpp-utils.h @@ -15,7 +15,7 @@ #include "ws_symbol_export.h" #include "tvbuff.h" #include "dissectors/packet-xml.h" -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #define xmpp_elem_cdata(elem) \ elem->data?elem->data->value:"" diff --git a/epan/epan.c b/epan/epan.c index ec0a5adbad..d10ec5db48 100644 --- a/epan/epan.c +++ b/epan/epan.c @@ -41,7 +41,7 @@ #include "tap.h" #include "addr_resolv.h" #include "oids.h" -#include "wmem/wmem.h" +#include <epan/wmem_scopes.h> #include "expert.h" #include "print.h" #include "capture_dissectors.h" diff --git a/epan/expert.c b/epan/expert.c index 6536292eca..db49283fc8 100644 --- a/epan/expert.c +++ b/epan/expert.c @@ -20,7 +20,7 @@ #include "expert.h" #include "uat.h" #include "prefs.h" -#include "wmem/wmem.h" +#include <epan/wmem_scopes.h> #include "tap.h" #include <wsutil/wslog.h> diff --git a/epan/export_object.h b/epan/export_object.h index a2278b7d3c..23757e50d4 100644 --- a/epan/export_object.h +++ b/epan/export_object.h @@ -12,7 +12,7 @@ #define __EXPORT_OBJECT_H__ #include "tap.h" -#include "wmem/wmem.h" +#include <epan/wmem_scopes.h> #ifdef __cplusplus extern "C" { diff --git a/epan/filter_expressions.h b/epan/filter_expressions.h index 2cca36c648..b39b413174 100644 --- a/epan/filter_expressions.h +++ b/epan/filter_expressions.h @@ -14,7 +14,7 @@ #include "ws_symbol_export.h" #include <epan/prefs.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #ifdef __cplusplus extern "C" { diff --git a/epan/follow.h b/epan/follow.h index 218fdb75d8..2ac4d66e3a 100644 --- a/epan/follow.h +++ b/epan/follow.h @@ -17,7 +17,7 @@ #include <epan/packet.h> #include <epan/ipv6.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include "ws_symbol_export.h" #ifdef __cplusplus diff --git a/epan/ftypes/ftypes.h b/epan/ftypes/ftypes.h index 67676d4452..a43b655d84 100644 --- a/epan/ftypes/ftypes.h +++ b/epan/ftypes/ftypes.h @@ -13,7 +13,7 @@ #define __FTYPES_H__ #include <glib.h> -#include "../wmem/wmem.h" +#include <epan/wmem_scopes.h> #include "ws_symbol_export.h" #ifdef __cplusplus diff --git a/epan/guid-utils.c b/epan/guid-utils.c index bb57fcd9e5..2d0395e9a8 100644 --- a/epan/guid-utils.c +++ b/epan/guid-utils.c @@ -16,7 +16,7 @@ #include <glib.h> #include <epan/epan.h> #include <wsutil/unicode-utils.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include "guid-utils.h" #ifdef _WIN32 diff --git a/epan/maxmind_db.c b/epan/maxmind_db.c index 7b3016a7c9..6d77b10b42 100644 --- a/epan/maxmind_db.c +++ b/epan/maxmind_db.c @@ -23,7 +23,7 @@ static mmdb_lookup_t mmdb_not_found; #include <stdio.h> #include <errno.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/addr_resolv.h> #include <epan/uat.h> diff --git a/epan/media_params.h b/epan/media_params.h index e8b8c68bf2..b4747fc573 100644 --- a/epan/media_params.h +++ b/epan/media_params.h @@ -16,7 +16,7 @@ #ifndef __MEDIA_PARAMS_H__ #define __MEDIA_PARAMS_H__ -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include "ws_symbol_export.h" diff --git a/epan/oids.c b/epan/oids.c index 236cbb6b6f..b80c79a801 100644 --- a/epan/oids.c +++ b/epan/oids.c @@ -18,7 +18,7 @@ #include <wsutil/report_message.h> -#include "wmem/wmem.h" +#include <epan/wmem_scopes.h> #include "uat.h" #include "prefs.h" #include "proto.h" diff --git a/epan/oids.h b/epan/oids.h index a102c46e96..2caa137726 100644 --- a/epan/oids.h +++ b/epan/oids.h @@ -15,7 +15,7 @@ #include <epan/ftypes/ftypes.h> #include <epan/prefs.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include "ws_symbol_export.h" #ifdef __cplusplus diff --git a/epan/oids_test.c b/epan/oids_test.c index f8e2c2f547..5937315033 100644 --- a/epan/oids_test.c +++ b/epan/oids_test.c @@ -17,7 +17,7 @@ #include <glib.h> #include "oids.h" -#include "wmem/wmem.h" +#include <epan/wmem_scopes.h> #include <ws_diag_control.h> diff --git a/epan/packet.c b/epan/packet.c index c2eb0c9c75..417774a32a 100644 --- a/epan/packet.c +++ b/epan/packet.c @@ -30,7 +30,7 @@ #include "tvbuff.h" #include "epan_dissect.h" -#include "wmem/wmem.h" +#include <epan/wmem_scopes.h> #include <epan/exceptions.h> #include <epan/reassemble.h> diff --git a/epan/prefs-int.h b/epan/prefs-int.h index e18e4ced7e..9be59e27aa 100644 --- a/epan/prefs-int.h +++ b/epan/prefs-int.h @@ -14,7 +14,7 @@ #include <stdio.h> #include "ws_symbol_export.h" -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #ifdef __cplusplus extern "C" { diff --git a/epan/prefs.c b/epan/prefs.c index 6936d40988..d1cb9b9c82 100644 --- a/epan/prefs.c +++ b/epan/prefs.c @@ -42,7 +42,7 @@ #include "epan/filter_expressions.h" -#include "epan/wmem/wmem.h" +#include "epan/wmem_scopes.h" #include <epan/stats_tree.h> /* diff --git a/epan/proto.c b/epan/proto.c index bc7685644b..3eaf21da78 100644 --- a/epan/proto.c +++ b/epan/proto.c @@ -37,7 +37,7 @@ #include "proto.h" #include "epan_dissect.h" #include "tvbuff.h" -#include "wmem/wmem.h" +#include <epan/wmem_scopes.h> #include "charsets.h" #include "column-utils.h" #include "to_str-int.h" diff --git a/epan/proto.h b/epan/proto.h index 77e24617f7..4b1a427f0b 100644 --- a/epan/proto.h +++ b/epan/proto.h @@ -27,7 +27,7 @@ #include <glib.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include "ipv4.h" #include "wsutil/nstime.h" diff --git a/epan/proto_data.c b/epan/proto_data.c index de364e2022..22dfba94d8 100644 --- a/epan/proto_data.c +++ b/epan/proto_data.c @@ -12,7 +12,7 @@ #include <glib.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/packet_info.h> #include <epan/proto_data.h> #include <epan/proto.h> diff --git a/epan/range.h b/epan/range.h index ed14bb23e5..1a4773101a 100644 --- a/epan/range.h +++ b/epan/range.h @@ -16,7 +16,7 @@ #include <glib.h> #include "ws_symbol_export.h" -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #ifdef __cplusplus extern "C" { diff --git a/epan/rtd_table.h b/epan/rtd_table.h index fcd308705d..2cda22bd12 100644 --- a/epan/rtd_table.h +++ b/epan/rtd_table.h @@ -15,7 +15,7 @@ #include "tap.h" #include "timestats.h" #include "value_string.h" -#include "wmem/wmem.h" +#include <epan/wmem_scopes.h> #ifdef __cplusplus extern "C" { diff --git a/epan/sequence_analysis.c b/epan/sequence_analysis.c index d001673228..1f878bd853 100644 --- a/epan/sequence_analysis.c +++ b/epan/sequence_analysis.c @@ -19,7 +19,7 @@ #include "color_filters.h" #include "column-info.h" #include "tap.h" -#include "wmem/wmem.h" +#include <epan/wmem_scopes.h> #define NODE_OVERFLOW MAX_NUM_NODES+1 diff --git a/epan/srt_table.h b/epan/srt_table.h index 8c96e3ec86..55d256c9d6 100644 --- a/epan/srt_table.h +++ b/epan/srt_table.h @@ -13,7 +13,7 @@ #include "tap.h" #include "timestats.h" -#include "wmem/wmem.h" +#include <epan/wmem_scopes.h> #ifdef __cplusplus extern "C" { diff --git a/epan/stat_tap_ui.h b/epan/stat_tap_ui.h index 19a0fb9015..94f13a0a82 100644 --- a/epan/stat_tap_ui.h +++ b/epan/stat_tap_ui.h @@ -17,7 +17,7 @@ #include <epan/stat_groups.h> #include <epan/packet_info.h> #include <epan/tap.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #ifdef __cplusplus extern "C" { diff --git a/epan/strutil.h b/epan/strutil.h index 8ce34146bb..4f4e94faa0 100644 --- a/epan/strutil.h +++ b/epan/strutil.h @@ -13,7 +13,7 @@ #include "ws_symbol_export.h" -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <wsutil/str_util.h> #ifdef __cplusplus diff --git a/epan/to_str.c b/epan/to_str.c index ba63669beb..f79d0bb522 100644 --- a/epan/to_str.c +++ b/epan/to_str.c @@ -15,7 +15,7 @@ #include <time.h> #include <glib.h> -#include "wmem/wmem.h" +#include <epan/wmem_scopes.h> #include "proto.h" #include "to_str.h" #include "to_str-int.h" diff --git a/epan/to_str.h b/epan/to_str.h index 4798bcc8cf..1e20e007c0 100644 --- a/epan/to_str.h +++ b/epan/to_str.h @@ -19,7 +19,7 @@ #include <epan/packet_info.h> #include <epan/ipv6.h> #include "ws_symbol_export.h" -#include "wmem/wmem.h" +#include <epan/wmem_scopes.h> #define GUID_STR_LEN 37 #define MAX_ADDR_STR_LEN 256 diff --git a/epan/tvbparse.c b/epan/tvbparse.c index d3f2e2e9d3..6d48b7a346 100644 --- a/epan/tvbparse.c +++ b/epan/tvbparse.c @@ -15,7 +15,7 @@ #include <string.h> #include <glib.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/proto.h> #include <epan/packet_info.h> #include <epan/tvbparse.h> diff --git a/epan/tvbuff.h b/epan/tvbuff.h index 128bcc7d2a..f6030d6adf 100644 --- a/epan/tvbuff.h +++ b/epan/tvbuff.h @@ -23,7 +23,7 @@ #include <glib.h> #include <epan/guid-utils.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/ipv6.h> #include <wsutil/nstime.h> diff --git a/epan/tvbuff_lz77.c b/epan/tvbuff_lz77.c index 8bd43048c0..6a1d0e3a6e 100644 --- a/epan/tvbuff_lz77.c +++ b/epan/tvbuff_lz77.c @@ -12,7 +12,7 @@ #include <glib.h> #include <epan/exceptions.h> #include <epan/tvbuff.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #define MAX_INPUT_SIZE (16*1024*1024) /* 16MB */ diff --git a/epan/tvbuff_lz77huff.c b/epan/tvbuff_lz77huff.c index a0e9af5dea..86879bbb17 100644 --- a/epan/tvbuff_lz77huff.c +++ b/epan/tvbuff_lz77huff.c @@ -21,7 +21,7 @@ #include <stdlib.h> /* qsort */ #include <epan/exceptions.h> #include <epan/tvbuff.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #define MAX_INPUT_SIZE (16*1024*1024) /* 16MB */ diff --git a/epan/tvbuff_lznt1.c b/epan/tvbuff_lznt1.c index 9b40756b55..7b1a5b64ac 100644 --- a/epan/tvbuff_lznt1.c +++ b/epan/tvbuff_lznt1.c @@ -16,7 +16,7 @@ #include <glib.h> #include <epan/exceptions.h> #include <epan/tvbuff.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #define MAX_INPUT_SIZE (16*1024*1024) /* 16MB */ diff --git a/epan/value_string.c b/epan/value_string.c index ab460a64f2..5fd639c819 100644 --- a/epan/value_string.c +++ b/epan/value_string.c @@ -14,7 +14,7 @@ #include <stdio.h> #include <string.h> -#include "wmem/wmem.h" +#include <epan/wmem_scopes.h> #include "proto.h" #include "to_str.h" #include "value_string.h" diff --git a/epan/value_string.h b/epan/value_string.h index dc88712a82..940f5827db 100644 --- a/epan/value_string.h +++ b/epan/value_string.h @@ -14,7 +14,7 @@ #include <glib.h> #include "ws_symbol_export.h" -#include "wmem/wmem.h" +#include <epan/wmem_scopes.h> #ifdef __cplusplus extern "C" { diff --git a/epan/wmem/wmem.h b/epan/wmem/wmem.h deleted file mode 100644 index e09dd2a518..0000000000 --- a/epan/wmem/wmem.h +++ /dev/null @@ -1,30 +0,0 @@ -/* wmem.h - * Definitions for the EPAN Memory Manager scopes - * 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 __EPAN_WMEM_H__ -#define __EPAN_WMEM_H__ - -#include "wmem_scopes.h" - -#endif /* __EPAN_WMEM_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: - */ diff --git a/epan/wmem/wmem_scopes.c b/epan/wmem_scopes.c index d8385d74d6..d8385d74d6 100644 --- a/epan/wmem/wmem_scopes.c +++ b/epan/wmem_scopes.c diff --git a/epan/wmem/wmem_scopes.h b/epan/wmem_scopes.h index 5980870b7f..5980870b7f 100644 --- a/epan/wmem/wmem_scopes.h +++ b/epan/wmem_scopes.h diff --git a/epan/wslua/wslua_dumper.c b/epan/wslua/wslua_dumper.c index 4f6527c8af..698c6e385d 100644 --- a/epan/wslua/wslua_dumper.c +++ b/epan/wslua/wslua_dumper.c @@ -15,7 +15,7 @@ #include "config.h" #include <wiretap/wtap_opttypes.h> -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> /* WSLUA_MODULE Dumper Saving Capture Files diff --git a/epan/wslua/wslua_gui.c b/epan/wslua/wslua_gui.c index ec0c4c426b..3b293c4073 100644 --- a/epan/wslua/wslua_gui.c +++ b/epan/wslua/wslua_gui.c @@ -12,7 +12,7 @@ #include "config.h" -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include "wslua.h" diff --git a/epan/wslua/wslua_pinfo.c b/epan/wslua/wslua_pinfo.c index b27f492988..22ba30746e 100644 --- a/epan/wslua/wslua_pinfo.c +++ b/epan/wslua/wslua_pinfo.c @@ -16,7 +16,7 @@ #include "wslua_pinfo_common.h" -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> #include <epan/conversation.h> #include <string.h> diff --git a/epan/wslua/wslua_tvb.c b/epan/wslua/wslua_tvb.c index a2f253ef32..c0f53af8da 100644 --- a/epan/wslua/wslua_tvb.c +++ b/epan/wslua/wslua_tvb.c @@ -18,7 +18,7 @@ #include "config.h" #include "wslua.h" -#include <epan/wmem/wmem.h> +#include <epan/wmem_scopes.h> /* WSLUA_MODULE Tvb Functions For Handling Packet Data */ |