From 83ec54675c19f25cfbb2e8a8863c6ee2191d8b0c Mon Sep 17 00:00:00 2001
From: Gilbert Ramirez <gram@alumni.rice.edu>
Date: Wed, 27 Sep 2000 04:55:05 +0000
Subject: First step in moving core Ethereal routines to libepan.

svn path=/trunk/; revision=2458
---
 tethereal.c | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'tethereal.c')

diff --git a/tethereal.c b/tethereal.c
index ae58baec1d..bbcb539532 100644
--- a/tethereal.c
+++ b/tethereal.c
@@ -1,6 +1,6 @@
 /* tethereal.c
  *
- * $Id: tethereal.c,v 1.47 2000/09/20 08:28:43 guy Exp $
+ * $Id: tethereal.c,v 1.48 2000/09/27 04:54:33 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -75,6 +75,9 @@
 #include "getopt.h"
 #endif
 
+#include <glib.h>
+#include <epan.h>
+
 #include "globals.h"
 #include "timestamp.h"
 #include "packet.h"
@@ -187,7 +190,7 @@ main(int argc, char *argv[])
      "-G" flag, as the "-G" flag dumps a list of fields registered
      by the dissectors, and we must do it before we read the preferences,
      in case any dissectors register preferences. */
-  dissect_init();
+  epan_init();
 
   /* Now register the preferences for any non-dissector modules.
      We must do that before we read the preferences as well. */
@@ -457,7 +460,7 @@ main(int argc, char *argv[])
   if (rfilter != NULL) {
     if (dfilter_compile(rfilter, &rfcode) != 0) {
       fprintf(stderr, "tethereal: %s\n", dfilter_error_msg);
-      dissect_cleanup();
+      epan_cleanup();
       exit(2);
     }
   }
@@ -465,12 +468,12 @@ main(int argc, char *argv[])
   if (cf_name) {
     err = open_cap_file(cf_name, FALSE, &cfile);
     if (err != 0) {
-      dissect_cleanup();
+      epan_cleanup();
       exit(2);
     }
     err = load_cap_file(&cfile, out_file_type);
     if (err != 0) {
-      dissect_cleanup();
+      epan_cleanup();
       exit(2);
     }
     cf_name[0] = '\0';
@@ -507,7 +510,7 @@ main(int argc, char *argv[])
 #endif
   }
 
-  dissect_cleanup();
+  epan_cleanup();
 
   exit(0);
 }
@@ -529,7 +532,7 @@ capture(int packet_count, int out_file_type)
 #endif
 
   /* Initialize the table of conversations. */
-  conversation_init();
+  epan_conversation_init();
 
   /* Initialize protocol-specific variables */
   init_all_protocols();
@@ -1080,7 +1083,7 @@ open_cap_file(char *fname, gboolean is_tempfile, capture_file *cf)
   /* The open succeeded.  Fill in the information for this file. */
 
   /* Initialize the table of conversations. */
-  conversation_init();
+  epan_conversation_init();
 
   /* Initialize protocol-specific variables */
   init_all_protocols();
-- 
cgit v1.2.3