Remove some apparently-unnecessary includes of emem.h.

Change-Id: Ib7d1b587b439ff21ec6b7f1756ce6ccf25b66f80
Reviewed-on: https://code.wireshark.org/review/6635
Reviewed-by: Guy Harris <guy@alum.mit.edu>

diff --git a/epan/follow.c b/epan/follow.c
index 61f73b596f983f98b5385218aea2ec5752b3e4e9..8900d7101c5cf414103ca76cf4cc67ce5717e38f 100644 (file)
--- a/epan/follow.c
+++ b/epan/follow.c
@@ -34,7 +34,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/to_str.h>
-#include <epan/emem.h>
 #include <epan/dissectors/packet-tcp.h>
 #include <epan/dissectors/packet-udp.h>
 #include "follow.h"

diff --git a/epan/frame_data.c b/epan/frame_data.c
index bfce7717797f90137149809a0054c2ca6b2c385d..526e95f924591a76bdd5e69fee721eb46720c034 100644 (file)
--- a/epan/frame_data.c
+++ b/epan/frame_data.c
@@ -29,7 +29,6 @@
 #include <wiretap/wtap.h>
 #include <epan/frame_data.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/wmem/wmem.h>
 #include <epan/timestamp.h>
 #include <epan/packet_info.h>

diff --git a/epan/ftypes/ftype-integer.c b/epan/ftypes/ftype-integer.c
index 6a9df1a964ea9e3ef865acccafc95df3fe9ab229..0b0dd698f9868627b2f79ca55f10d9561df5463b 100644 (file)
--- a/epan/ftypes/ftype-integer.c
+++ b/epan/ftypes/ftype-integer.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include "ftypes-int.h"
-#include <epan/emem.h>
 #include <epan/addr_resolv.h>
 
 #include <wsutil/pint.h>

diff --git a/epan/ftypes/ftype-string.c b/epan/ftypes/ftype-string.c
index d7d0a0060e4848659c83df4a6064ab8f1596e005..607295e56df82e30b7eaeb850a85efbc992626be 100644 (file)
--- a/epan/ftypes/ftype-string.c
+++ b/epan/ftypes/ftype-string.c
@@ -22,7 +22,6 @@
 
 #include <stdio.h>
 #include <ftypes-int.h>
-#include <epan/emem.h>
 #include <string.h>
 
 #define CMP_MATCHES cmp_matches

diff --git a/epan/gcp.c b/epan/gcp.c
index 5937ce8c3a0e6caba30b968edb5eac302752c5b8..90b4dc77c2baf92d3a63c320326194cb2c95669c 100644 (file)
--- a/epan/gcp.c
+++ b/epan/gcp.c
@@ -29,8 +29,6 @@
 
 #include "config.h"
 
-#include <epan/emem.h>
-
 #include "gcp.h"
 
 static wmem_tree_t* msgs = NULL;

diff --git a/epan/guid-utils.c b/epan/guid-utils.c
index 66020afd4dad4bc822d1babec8665e39dbab659c..e8f786222c6cb088269c6e97dda2ce568276c3c3 100644 (file)
--- a/epan/guid-utils.c
+++ b/epan/guid-utils.c
@@ -28,7 +28,6 @@
 #include <glib.h>
 #include <epan/epan.h>
 #include <wsutil/unicode-utils.h>
-#include <epan/emem.h>
 #include <epan/wmem/wmem.h>
 #include "guid-utils.h"
 

diff --git a/epan/h225-persistentdata.c b/epan/h225-persistentdata.c
index f08fabdb205a1eb2f9ecda67b27bbb2dcfe7eac7..6d5634cd650a7406bdf996e1ac1edc092a3fec07 100644 (file)
--- a/epan/h225-persistentdata.c
+++ b/epan/h225-persistentdata.c
@@ -28,7 +28,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 
 #include <stdio.h>
 #include <string.h>

diff --git a/epan/oids_test.c b/epan/oids_test.c
index 3a0fa7d6e3288b4e3ecd5657b54c67af5a7976c0..8825d3c118360b7dea3c28a61da25a4675e8914b 100644 (file)
--- a/epan/oids_test.c
+++ b/epan/oids_test.c
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <glib.h>
 
-#include "emem.h"
 #include "oids.h"
 #include "wmem/wmem.h"
 
@@ -496,10 +495,6 @@ main(int argc, char **argv)
     oids_cleanup();
     wmem_destroy_allocator(test_scope);
     wmem_cleanup();
-    /*
-     * This might have been a good place for a call to ep_free_all() but that is not part of the
-     * public interface for emem.h
-     */
     return result;
 }
 

diff --git a/epan/osi-utils.c b/epan/osi-utils.c
index 00cdba13df7ff5ef62b567461d878cf2f2b7a62c..5632efacfb3080b9e507e28a544268ffbded50aa 100644 (file)
--- a/epan/osi-utils.c
+++ b/epan/osi-utils.c
@@ -32,7 +32,6 @@
 
 #include "tvbuff.h"
 #include "osi-utils.h"
-#include "emem.h"
 
 /*
  * XXX - shouldn't there be a centralized routine for dissecting NSAPs?

diff --git a/epan/range.c b/epan/range.c
index 0101a8d86ed6898f67fc9b2957c32672772b84f0..cc58292f7333fe8d99e1cd7ba142781c0270d65b 100644 (file)
--- a/epan/range.c
+++ b/epan/range.c
@@ -34,7 +34,6 @@
 #include <epan/frame_data.h>
 
 #include <epan/range.h>
-#include <epan/emem.h>
 #include <stdio.h>
 
 /*

diff --git a/epan/reassemble.c b/epan/reassemble.c
index 109c040a3d8d3fe51ae8d449346265c06e1d8855..a10ff209cbf489d117ca9771f87c3ab50015411b 100644 (file)
--- a/epan/reassemble.c
+++ b/epan/reassemble.c
@@ -26,7 +26,6 @@
 
 #include <epan/packet.h>
 #include <epan/exceptions.h>
-#include <epan/emem.h>
 #include <epan/reassemble.h>
 #include <epan/tvbuff-int.h>
 

diff --git a/epan/reassemble_test.c b/epan/reassemble_test.c
index 8d9a9b55159bd52691784e7222bc47a96c50ab4c..a4d8eb5bebb359d4977a9e088e2aaa6a25300d7f 100644 (file)
--- a/epan/reassemble_test.c
+++ b/epan/reassemble_test.c
@@ -58,7 +58,6 @@
 
 #include "config.h"
 
-#include <epan/emem.h>
 #include <epan/packet.h>
 #include <epan/packet_info.h>
 #include <epan/proto.h>

diff --git a/epan/sigcomp-udvm.c b/epan/sigcomp-udvm.c
index c363b542e05be01c5f7a6b23b759b731221bb7ad..ed172c342460f6304c5914bd3eb624425c78bda7 100644 (file)
--- a/epan/sigcomp-udvm.c
+++ b/epan/sigcomp-udvm.c
@@ -35,8 +35,6 @@
 #include <string.h>
 #include <glib.h>
 
-#include <epan/emem.h>
-
 #include <wsutil/sha1.h>
 #include <wsutil/crc16.h>
 

diff --git a/epan/sna-utils.c b/epan/sna-utils.c
index 176c97a83e8c778e2671480c4eec70111bdd5817..7b5c19164fd7febc843006721acd50cc8321379a 100644 (file)
--- a/epan/sna-utils.c
+++ b/epan/sna-utils.c
@@ -28,7 +28,6 @@
 #include "packet_info.h"
 #include "wsutil/pint.h"
 #include "sna-utils.h"
-#include "emem.h"
 
 gchar *
 sna_fid_to_str(const address *addr)

diff --git a/epan/stream.c b/epan/stream.c
index eca4f917d15888783b62cc8b10a38954262b21e0..03ab54a332b9ce7e795faf00e8bfa490fc372c9f 100644 (file)
--- a/epan/stream.c
+++ b/epan/stream.c
@@ -27,7 +27,6 @@
 
 #include <glib.h>
 #include <epan/packet.h>
-#include <epan/emem.h>
 #include <epan/reassemble.h>
 #include <epan/stream.h>
 #include <epan/tvbuff.h>

diff --git a/epan/strutil.c b/epan/strutil.c
index 53c646036d5d4721f941ac5545cb9ab18b4d0fca..762d704f2dfd0baf989d6e6eaa755df47ef8bdcf 100644 (file)
--- a/epan/strutil.c
+++ b/epan/strutil.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <glib.h>
 #include "strutil.h"
-#include "emem.h"
 
 #include <wsutil/str_util.h>
 #include <epan/proto.h>

diff --git a/epan/to_str.c b/epan/to_str.c
index e56381e4db0cd7eb5edff769b0fc6c0a9a07f276..0a8f070ed3f8d7a891bc7f06f8a9ecf0566f65cf 100644 (file)
--- a/epan/to_str.c
+++ b/epan/to_str.c
@@ -27,7 +27,6 @@
 #include <time.h>
 #include <glib.h>
 
-#include "emem.h"
 #include "wmem/wmem.h"
 #include "proto.h"
 #include "to_str.h"

diff --git a/epan/tvbuff_composite.c b/epan/tvbuff_composite.c
index 60f8108bd69e0b0e81a691b64a9d9ee50ce84c24..684e6440e9fe848a8ef9f9f3660a8e82ff91c3e3 100644 (file)
--- a/epan/tvbuff_composite.c
+++ b/epan/tvbuff_composite.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <epan/emem.h>
-
 #include "tvbuff.h"
 #include "tvbuff-int.h"
 #include "proto.h"     /* XXX - only used for DISSECTOR_ASSERT, probably a new header file? */

diff --git a/epan/tvbuff_real.c b/epan/tvbuff_real.c
index 991cc1c0454ef0009cce1051e90bd24d0ddc9c61..4d0b13d07abb2d9d540cc2e8c4cc1158dee6c571 100644 (file)
--- a/epan/tvbuff_real.c
+++ b/epan/tvbuff_real.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <epan/emem.h>
-
 #include "tvbuff.h"
 #include "tvbuff-int.h"
 #include "proto.h"     /* XXX - only used for DISSECTOR_ASSERT, probably a new header file? */

diff --git a/epan/tvbuff_subset.c b/epan/tvbuff_subset.c
index 3b98a70b46ce9fb8088460af08d26bc5c5891da9..fbfe48af1ca49ae5cdebda8030b4d510c1104f2b 100644 (file)
--- a/epan/tvbuff_subset.c
+++ b/epan/tvbuff_subset.c
@@ -23,8 +23,6 @@
 
 #include "config.h"
 
-#include <epan/emem.h>
-
 #include "tvbuff.h"
 #include "tvbuff-int.h"
 #include "proto.h"     /* XXX - only used for DISSECTOR_ASSERT, probably a new header file? */

diff --git a/epan/uat.c b/epan/uat.c
index ceafea882600d8d3d21daf60396734e77aa85d5b..0b4099a6c7d6db11b60c06ccdc18c707c15c4f4d 100644 (file)
--- a/epan/uat.c
+++ b/epan/uat.c
@@ -38,7 +38,6 @@
 #include <wsutil/str_util.h>
 #include <wsutil/report_err.h>
 
-#include <epan/emem.h>
 #include <wsutil/filesystem.h>
 #include <epan/packet.h>
 #include <epan/range.h>

diff --git a/epan/uat.h b/epan/uat.h
index aac58358eddd52d6b606d4c5b88e4b69a92edae1..8e9f56643fb01b5c66b3e771f34f80710a482021 100644 (file)
--- a/epan/uat.h
+++ b/epan/uat.h
@@ -30,8 +30,6 @@
 
 #include <stdlib.h>
 
-#include <epan/emem.h>
-
 #include "ws_symbol_export.h"
 
 #ifdef __cplusplus

diff --git a/epan/uat_load.l b/epan/uat_load.l
index acd9895f2680999a0f8debc62d80a642d9f5ded4..b9e8ee9a23bd8237da3ba2b3dc6af35c092e41b7 100644 (file)
--- a/epan/uat_load.l
+++ b/epan/uat_load.l
@@ -56,7 +56,6 @@
 
 #include <glib.h>
 
-#include <epan/emem.h>
 #include "uat-int.h"
 #include "uat_load_lex.h"
 #include <wsutil/file_util.h>

diff --git a/epan/xdlc.c b/epan/xdlc.c
index e4a0f0564c838785de03c19a0083c99decde0fdb..d6c5453d1437b1daa4c0cbe1c32125c1918f366b 100644 (file)
--- a/epan/xdlc.c
+++ b/epan/xdlc.c
@@ -29,7 +29,6 @@
 #include <glib.h>
 #include <epan/packet.h>
 #include <epan/xdlc.h>
-#include <epan/emem.h>
 #include <wsutil/pint.h>
 
 const value_string ftype_vals[] = {