summaryrefslogtreecommitdiff
path: root/wiretap/ascendtext.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:55:43 +0000
commit445abfaf506d31a8b37d6c288e300deeaa73ae46 (patch)
tree0e1cceb1ee0a6b72f841f5d505e3fa33aa1aefa6 /wiretap/ascendtext.c
parent21bf67a98db6474956d2e67e0532108a4c7980c2 (diff)
downloadwireshark-445abfaf506d31a8b37d6c288e300deeaa73ae46.tar.gz
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: I242f93013c7104f31783c9ee52adcb090ce7b367 Reviewed-on: https://code.wireshark.org/review/3067 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/ascendtext.c')
-rw-r--r--wiretap/ascendtext.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/wiretap/ascendtext.c b/wiretap/ascendtext.c
index 32d4d49418..1e6f4fbbf8 100644
--- 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"