Move epan/wmem/wmem_scopes.h to epan/

This header was installed incorrectly to epan/wmem_scopes.h.

Instead of creating additional installation rules for a single
header in a subfolder (kept for backward compatibility) just
rename the standard "epan/wmem/wmem.h" include to
"epan/wmem_scopes.h" and fix the documentation.

Now the header is installed *correctly* to epan/wmem_scopes.h.

debian/libwireshark-dev.install

@@ -7,4 +7,3 @@ epan/crypt/*.h usr/include/wireshark/epan/crypt
 epan/dfilter/*.h usr/include/wireshark/epan/dfilter
 epan/dissectors/*.h usr/include/wireshark/epan/dissectors
 epan/ftypes/*.h usr/include/wireshark/epan/ftypes
-epan/wmem/*.h usr/include/wireshark/epan/wmem

doc/README.request_response_tracking

@@ -27,11 +27,9 @@ The example below shows how simple this is to add to the dissector IF:
 
 The example is taken from the PANA dissector:
 
-First we need to include the definitions for conversations and memory
-management.
+First we need to include the definitions for conversations.
 
 	#include <epan/conversation.h>
-	#include <epan/wmem/wmem.h>
 
 Then we also need a few header fields to show the relations between request
 and response as well as the response time.

doc/README.wmem

@@ -5,9 +5,9 @@ the old 'emem' framework which was removed in Wireshark 2.0.
 
 In order to make memory management easier and to reduce the probability of
 memory leaks, Wireshark provides its own memory management API. This API is
-implemented inside epan/wmem/ and provides memory pools and functions that make
+implemented inside wsutil/wmem/ and provides memory pools and functions that make
 it easy to manage memory even in the face of exceptions (which many dissector
-functions can raise).
+functions can raise). Memory scopes for dissection are defined in epan/wmem_scopes.h.
 
 Correct use of these functions will make your code faster, and greatly reduce
 the chances that it will leak memory in exceptional cases.
@@ -19,7 +19,7 @@ https://www.wireshark.org/lists/wireshark-dev/201210/msg00178.html
 
 If you're writing a dissector, or other "userspace" code, then using wmem
 should be very similar to using malloc or g_malloc or whatever else you're used
-to. All you need to do is include the header (epan/wmem/wmem.h) and optionally
+to. All you need to do is include the header (epan/wmem_scopes.h) and optionally
 get a handle to a memory pool (if you want to *create* a memory pool, see the
 section "3. Usage for Producers" below).
 
@@ -53,7 +53,7 @@ changed without warning.
 
 2.2 Wireshark Global Pools
 
-Dissectors that include the wmem header file will have three pools available
+Dissectors that include the wmem_scopes.h header file will have three pools available
 to them automatically: pinfo->pool, wmem_file_scope() and
 wmem_epan_scope(); there is also a wmem_packet_scope() for cases when the
 `pinfo` argument is not accessible, but pinfo->pool should be preferred.
@@ -66,7 +66,7 @@ current capture file is closed.
 
 NB: Using these pools outside of the appropriate scope (e.g. using the file
     pool when there isn't a file open) will throw an assertion.
-    See the comment in epan/wmem/wmem_scopes.c for details.
+    See the comment in epan/wmem_scopes.c for details.
 
 The epan pool is scoped to the library's lifetime - memory allocated in it is
 not freed until epan_cleanup() is called, which is typically but not necessarily
@@ -170,7 +170,7 @@ To create a pool, include the regular wmem header and call the
 wmem_allocator_new() function with the appropriate type value.
 For example:
 
-    #include "wmem/wmem.h"
+    #include <wsutil/wmem/wmem.h>
 
     wmem_allocator_t *myPool;
     myPool = wmem_allocator_new(WMEM_ALLOCATOR_SIMPLE);
@@ -186,7 +186,7 @@ document.
 Regardless of which allocator you used to create a pool, it can be destroyed
 with a call to the function wmem_destroy_allocator(). For example:
 
-    #include "wmem/wmem.h"
+    #include <wsutil/wmem/wmem.h>
 
     wmem_allocator_t *myPool;
 
@@ -206,7 +206,7 @@ allowing it to be reused later. Depending on the type of allocator, doing this
 and recreating the pool. This method is therefore recommended, especially when
 the pool would otherwise be scoped to a single iteration of a loop. For example:
 
-    #include "wmem/wmem.h"
+    #include <wsutil/wmem/wmem.h>
 
     wmem_allocator_t *myPool;
 

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

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

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>

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" {

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" {

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,

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;

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>
 

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>
 

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>

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,

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"

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);

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"

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"

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>

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>

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;

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"

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"
 

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>
 

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>
 

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>

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);

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"
 

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>

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>
 
 

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>

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"

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>
 

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"
 

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>
 

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>

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>

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>

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>

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 {

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 {

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;
 

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>

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>

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" {

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>

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>

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 */

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;

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"
 

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

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 {

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);

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:""

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"

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>

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" {

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" {

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

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

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

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>

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"
 

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"

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

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>
 

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>

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" {

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>
 
 /*

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"

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"

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>

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" {

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" {

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
 

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" {

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" {

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

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"

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

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>

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>

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 */
 

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 */
 

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 */
 

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"

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" {

epan/wmem/wmem.h

@@ -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>