Handle the case where dumpcap is compiled without thread support, which

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

diff --git a/cfile.c b/cfile.c
index b5b62e8ad196462608eed2b6cb9dee0fb3371960..3463c1d538f17d7011e6b5f6913e5a3788524d5f 100644 (file)
--- a/cfile.c
+++ b/cfile.c
@@ -1,11 +1,11 @@
 /* cfile.c
 /* cfile.c

- * capture_file GUI-independent manipulation 
+ * capture_file GUI-independent manipulation

  * Vassilii Khachaturov <vassilii@tarunz.org>
  *
  * Vassilii Khachaturov <vassilii@tarunz.org>
  *

- * $Id: cfile.c,v 1.1 2002/09/06 23:14:04 sahlberg Exp $
+ * $Id$

  *
  *

- * Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@ethereal.com>
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>

  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or
  * Copyright 1998 Gerald Combs
  *
  * This program is free software; you can redistribute it and/or


@@ -27,12 +27,6 @@
 # include "config.h"
 #endif
 
 # include "config.h"
 #endif
 

-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <stdlib.h>
-

 #include <glib.h>
 
 #include <epan/packet.h>
 #include <glib.h>
 
 #include <epan/packet.h>


@@ -40,26 +34,19 @@
 #include "cfile.h"
 
 void
 #include "cfile.h"
 
 void

-init_cap_file(capture_file *cf)
+cap_file_init(capture_file *cf)

 {
   /* Initialize the capture file struct */
 {
   /* 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->dfcode           = NULL;
-#ifdef HAVE_LIBPCAP
-  cf->cfilter          = g_strdup("");
-#endif
-  cf->iface            = NULL;
-  cf->save_file        = NULL;
-  cf->save_file_fd     = -1;
-  cf->has_snap = FALSE;
-  cf->snap             = WTAP_MAX_PACKET_SIZE;
-  cf->count            = 0;
-  cf->pstats           = NULL;
+  cf->filename      = NULL;
+  cf->source        = NULL;
+  cf->is_tempfile   = FALSE;
+  cf->user_saved    = FALSE;
+  cf->count         = 0;
+  cf->has_snap      = FALSE;
+  cf->snap          = WTAP_MAX_PACKET_SIZE;
+  cf->wth           = NULL;
+  cf->rfcode        = NULL;
+  cf->dfilter       = NULL;
+  cf->redissecting  = FALSE;
+  cf->frames        = NULL;

 }
 }