Only one buffer.c, please.

Otherwise, if you link with both libwiretap and libfiletap, it's anybody's guess which one you get. That means you're wasting memory with two copies of its routines if they're identical, and means surprising behavior if they're not (which showed up when I was debugging a double-free crash - fixing libwiretap's buffer_free() didn't fix the problem, because Wireshark happened to be calling libfiletap' unfixed buffer_free()). There's nothing *tap-specific about Buffers, anyway, so it really belongs in wsutil. Change-Id: I91537e46917e91277981f8f3365a2c0873152870 Reviewed-on: https://code.wireshark.org/review/3066 Reviewed-by: Guy Harris <[email protected]>
pstavirs · Jul 15, 2014 · d4dab16 · d4dab16
1 parent 61ac815
commit d4dab16
Show file tree

Hide file tree

Showing 65 changed files with 58 additions and 295 deletions.
diff --git a/filetap/CMakeLists.txt b/filetap/CMakeLists.txt
@@ -22,7 +22,6 @@
 include(UseABICheck)
 
 set(CLEAN_FILES
-	buffer.c
 	file_access.c
 	ft_file_wrappers.c
 	ftap.c

diff --git a/filetap/Makefile.common b/filetap/Makefile.common
@@ -27,14 +27,12 @@
 # generated from YACC or Lex files (as Automake doesn't want them in
 # _SOURCES variables).
 NONGENERATED_C_FILES = \
-	buffer.c	\
 	file_access.c	\
 	ft_file_wrappers.c	\
 	ftap.c
 
 # Header files that are not generated from other files
 NONGENERATED_HEADER_FILES = \
-	buffer.h		\
 	ft_file_wrappers.h	\
 	ftap.h			\
 	ftap-int.h
diff --git a/filetap/file_access.c b/filetap/file_access.c
@@ -38,7 +38,7 @@
 
 #include "ftap-int.h"
 #include "ft_file_wrappers.h"
-#include "buffer.h"
+#include <wsutil/buffer.h>
 
 /*
  * Add an extension, and all compressed versions thereof, to a GSList

diff --git a/filetap/ftap.c b/filetap/ftap.c
@@ -39,7 +39,7 @@
 
 #include "ft_file_wrappers.h"
 #include <wsutil/file_util.h>
-#include "buffer.h"
+#include <wsutil/buffer.h>
 
 #ifdef HAVE_PLUGINS
 

diff --git a/filetap/ftap.h b/filetap/ftap.h
@@ -27,7 +27,7 @@
 
 #include <glib.h>
 #include <time.h>
-#include <filetap/buffer.h>
+#include <wsutil/buffer.h>
 #include <wsutil/nstime.h>
 #include "ws_symbol_export.h"
 

diff --git a/wiretap/5views.c b/wiretap/5views.c
@@ -25,7 +25,7 @@
 
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include "buffer.h"
+#include <wsutil/buffer.h>
 #include "5views.h"
 
 

diff --git a/wiretap/CMakeLists.txt b/wiretap/CMakeLists.txt
@@ -28,7 +28,6 @@ set(CLEAN_FILES
 	atm.c
 	ber.c
 	btsnoop.c
-	buffer.c
 	camins.c
 	catapult_dct2000.c
 	commview.c

diff --git a/wiretap/Makefile.common b/wiretap/Makefile.common
@@ -33,7 +33,6 @@ NONGENERATED_C_FILES = \
 	atm.c			\
 	ber.c			\
 	btsnoop.c		\
-	buffer.c		\
 	camins.c		\
 	catapult_dct2000.c	\
 	commview.c		\
@@ -90,7 +89,6 @@ NONGENERATED_HEADER_FILES = \
 	ascend-int.h		\
 	atm.h			\
 	ber.h			\
-	buffer.h		\
 	btsnoop.h		\
 	camins.h		\
 	catapult_dct2000.h	\

diff --git a/wiretap/aethra.c b/wiretap/aethra.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include "buffer.h"
+#include <wsutil/buffer.h>
 #include "aethra.h"
 
 /* Magic number in Aethra PC108 files. */

diff --git a/wiretap/ascend.y b/wiretap/ascend.y
@@ -133,7 +133,7 @@ XMIT-Max7:20: (task "_brouterControlTask" at 0xb094ac20, time: 1481.51) 20 octet
 #include <string.h>
 
 #include "wtap-int.h"
-#include "buffer.h"
+#include <wsutil/buffer.h>
 #include "ascendtext.h"
 #include "ascend-int.h"
 #include "file_wrappers.h"

diff --git a/wiretap/ascendtext.c b/wiretap/ascendtext.c
@@ -20,7 +20,7 @@
 
 #include "config.h"
 #include "wtap-int.h"
-#include "buffer.h"
+#include <wsutil/buffer.h>
 #include "ascendtext.h"
 #include "ascend-int.h"
 #include "file_wrappers.h"

diff --git a/wiretap/ber.c b/wiretap/ber.c
@@ -27,7 +27,7 @@
 
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include "buffer.h"
+#include <wsutil/buffer.h>
 #include "ber.h"
 
 

diff --git a/wiretap/btsnoop.c b/wiretap/btsnoop.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include "buffer.h"
+#include <wsutil/buffer.h>
 #include "atm.h"
 #include "btsnoop.h"
 

diff --git a/wiretap/buffer.c b/wiretap/buffer.c
diff --git a/wiretap/buffer.h b/wiretap/buffer.h
diff --git a/wiretap/camins.c b/wiretap/camins.c
@@ -64,7 +64,7 @@
 #include <wtap.h>
 #include <wtap-int.h>
 #include <file_wrappers.h>
-#include <buffer.h>
+#include <wsutil/buffer.h>
 
 #include "camins.h"
 

diff --git a/wiretap/catapult_dct2000.c b/wiretap/catapult_dct2000.c
@@ -26,7 +26,7 @@
 
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include "buffer.h"
+#include <wsutil/buffer.h>
 
 #include "catapult_dct2000.h"
 

diff --git a/wiretap/commview.c b/wiretap/commview.c
@@ -38,7 +38,7 @@
 
 #include "wtap.h"
 #include "wtap-int.h"
-#include "buffer.h"
+#include <wsutil/buffer.h>
 #include "file_wrappers.h"
 #include "commview.h"
 

diff --git a/wiretap/cosine.c b/wiretap/cosine.c
@@ -23,7 +23,7 @@
 
 #include "config.h"
 #include "wtap-int.h"
-#include "buffer.h"
+#include <wsutil/buffer.h>
 #include "cosine.h"
 #include "file_wrappers.h"