Have the frame_tvbuff.c routines not use the global cfile.

Have the routines that create them take a pointer to a struct
packet_provider_data, store that in the tvbuff data, and use it to get
the wtap from which packets are being read.

While we're at it, don't include globals.h in any header files, and
include it in source files iff the source file actually uses cfile.  Add
whatever includes that requires.

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

1 files changed, 12 insertions, 6 deletions

diff --git a/frame_tvbuff.h b/frame_tvbuff.h
index d9428e709d..5b8edb4dd4 100644
--- a/frame_tvbuff.h
+++ b/frame_tvbuff.h
@@ -11,19 +11,25 @@
 #ifndef __FRAME_TVBUFF_H__
 #define __FRAME_TVBUFF_H__
 
+#include "cfile.h"
+
+#include <wiretap/wtap.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include <wiretap/wtap.h>
-
-extern tvbuff_t *frame_tvbuff_new(const frame_data *fd, const guint8 *buf);
+extern tvbuff_t *frame_tvbuff_new(const struct packet_provider_data *prov,
+    const frame_data *fd, const guint8 *buf);
 
-extern tvbuff_t *frame_tvbuff_new_buffer(const frame_data *fd, Buffer *buf);
+extern tvbuff_t *frame_tvbuff_new_buffer(const struct packet_provider_data *prov,
+    const frame_data *fd, Buffer *buf);
 
-extern tvbuff_t *file_tvbuff_new(const frame_data *fd, const guint8 *buf);
+extern tvbuff_t *file_tvbuff_new(const struct packet_provider_data *prov,
+    const frame_data *fd, const guint8 *buf);
 
-extern tvbuff_t *file_tvbuff_new_buffer(const frame_data *fd, Buffer *buf);
+extern tvbuff_t *file_tvbuff_new_buffer(const struct packet_provider_data *prov,
+    const frame_data *fd, Buffer *buf);
 
 #ifdef __cplusplus
 }