Add #ifndef __PRIVILEGES_H__ / #define / #endif logic to prevent multiple

[obnox/wireshark/wip.git] / cfile.c

diff --git a/cfile.c b/cfile.c
index 8ad55160f7887a3e817002e2a8df45a5e2e997f7..89ab953d40bf1b5abff1926fc20184e5ff4b4e20 100644 (file)
--- a/cfile.c
+++ b/cfile.c
@@ -1,5 +1,5 @@
 /* cfile.c
- * capture_file GUI-independent manipulation 
+ * capture_file GUI-independent manipulation
  * Vassilii Khachaturov <vassilii@tarunz.org>
  *
  * $Id$
@@ -27,12 +27,6 @@
 # include "config.h"
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <stdlib.h>
-
 #include <glib.h>
 
 #include <epan/packet.h>
@@ -40,19 +34,33 @@
 #include "cfile.h"
 
 void
-init_cap_file(capture_file *cf)
+cap_file_init(capture_file *cf)
 {
   /* Initialize the capture file struct */
-  cf->plist            = NULL;
-  cf->plist_end        = NULL;
-  cf->wth              = NULL;
-  cf->filename = NULL;
-  cf->user_saved       = FALSE;
-  cf->is_tempfile      = FALSE;
-  cf->rfcode           = NULL;
-  cf->dfilter          = NULL;
-  cf->has_snap = FALSE;
-  cf->snap             = WTAP_MAX_PACKET_SIZE;
-  cf->count            = 0;
-  cf->pstats           = NULL;
+  cf->plist_start   = NULL;
+  cf->plist_end     = NULL;
+  cf->wth           = NULL;
+  cf->filename      = NULL;
+  cf->source        = NULL;
+  cf->user_saved    = FALSE;
+  cf->is_tempfile   = FALSE;
+  cf->rfcode        = NULL;
+  cf->dfilter       = NULL;
+  cf->has_snap      = FALSE;
+  cf->snap          = WTAP_MAX_PACKET_SIZE;
+  cf->count         = 0;
+  cf->redissecting  = FALSE;
+}
+
+void
+cap_file_add_fdata(capture_file *cf, frame_data *fdata)
+{
+  frame_data *plist_end = cf->plist_end;
+  fdata->prev = plist_end;
+  if (plist_end != NULL)
+    plist_end->next = fdata;
+  else
+    cf->plist_start = fdata;
+  cf->plist_end = fdata;
 }
+