Make sure our loops terminate.

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

diff --git a/cfile.c b/cfile.c
index 62fab27fbb44b27d3d3be34d971a433680290367..8fe484622c30af4205cb1fb6b7b253d62f33fa60 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$
@@ -20,18 +20,10 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <stdlib.h>
+#include "config.h"
 
 #include <glib.h>
 
@@ -40,20 +32,9 @@
 #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->redissecting     = FALSE;
+  memset(cf, 0, sizeof(capture_file));
+  cf->snap            = WTAP_MAX_PACKET_SIZE;
 }