aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/tnef.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2014-07-15 16:40:46 -0700
committerGuy Harris <guy@alum.mit.edu>2014-07-15 23:43:32 +0000
commitd4dab16a3fed4dc399083e454226675894b42871 (patch)
tree24be814f0f9d36acf67a4df4bc59ae11e8fc9576 /wiretap/tnef.c
parent61ac8156812f5f9ef277f303a5e22aac375ad357 (diff)
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 <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/tnef.c')
-rw-r--r--wiretap/tnef.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/tnef.c b/wiretap/tnef.c
index b7e834eaaa..aada2b9c0f 100644
--- a/wiretap/tnef.c
+++ b/wiretap/tnef.c
@@ -27,7 +27,7 @@
#include "wtap-int.h"
#include "file_wrappers.h"
-#include "buffer.h"
+#include <wsutil/buffer.h>
#include "tnef.h"
static gboolean tnef_read_file(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,