Move some definitions of stuff not used outside the Lucent/Ascend

capture file reading code from "ascend.h" to "ascend-int.h".

svn path=/trunk/; revision=788

3 files changed, 15 insertions, 13 deletions

diff --git a/wiretap/ascend-int.h b/wiretap/ascend-int.h
index 2fbc08cbdc..e5c9a75c8f 100644
--- a/wiretap/ascend-int.h
+++ b/wiretap/ascend-int.h
@@ -2,7 +2,7 @@
  * Definitions for routines common to multiple modules in the Lucent/Ascend
  * capture file reading code code, but not used outside that code.
  *
- * $Id: ascend-int.h,v 1.1 1999/10/08 07:41:33 guy Exp $
+ * $Id: ascend-int.h,v 1.2 1999/10/08 07:45:31 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -27,6 +27,13 @@
 #ifndef __ASCEND_INT_H__
 #define __ASCEND_INT_H__
 
+typedef struct {
+  time_t secs;
+  time_t usecs;
+  guint32 caplen;
+  guint32 len;
+} ascend_pkthdr;
+
 /* Sigh.  The #defines to replace "yy" with "ascend" in the names of
  * various parser routines appear in the ".c" files generated by Yacc
  * and Flex, *not* in any header files; duplicate them here, but
@@ -39,4 +46,8 @@
 /* Here we provide interfaces to make our scanner act and look like lex */
 int yylex(void);
 
+void init_parse_ascend(void);
+int parse_ascend(FILE *fh, void *pd, struct ascend_phdr *phdr,
+		ascend_pkthdr *hdr, int len);
+
 #endif /* ! __ASCEND_INT_H__ */
diff --git a/wiretap/ascend.c b/wiretap/ascend.c
index e8f43b8a7e..13834620de 100644
--- a/wiretap/ascend.c
+++ b/wiretap/ascend.c
@@ -1,6 +1,6 @@
 /* ascend.c
  *
- * $Id: ascend.c,v 1.7 1999/09/23 04:56:52 guy Exp $
+ * $Id: ascend.c,v 1.8 1999/10/08 07:45:31 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu>
@@ -26,6 +26,7 @@
 #include "wtap.h"
 #include "buffer.h"
 #include "ascend.h"
+#include "ascend-int.h"
 #include "file.h"
 
 #include <sys/stat.h>
diff --git a/wiretap/ascend.h b/wiretap/ascend.h
index c9db11ae1d..009fdfeb26 100644
--- a/wiretap/ascend.h
+++ b/wiretap/ascend.h
@@ -1,6 +1,6 @@
 /* ascend.h
  *
- * $Id: ascend.h,v 1.3 1999/09/11 22:36:38 gerald Exp $
+ * $Id: ascend.h,v 1.4 1999/10/08 07:45:31 guy Exp $
  *
  * Wiretap Library
  * Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu>
@@ -25,15 +25,5 @@
 #define ASCEND_MAX_DATA_COLS 16
 #define ASCEND_MAX_PKT_LEN (ASCEND_MAX_DATA_ROWS * ASCEND_MAX_DATA_COLS)
 
-typedef struct {
-  time_t secs;
-  time_t usecs;
-  guint32 caplen;
-  guint32 len;
-} ascend_pkthdr;
-
 int ascend_open(wtap *wth, int *err);
-void init_parse_ascend();
-int parse_ascend(FILE *fh, void *pd, struct ascend_phdr *phdr,
-		ascend_pkthdr *hdr, int len);
 int ascend_seek_read (FILE *fh, int seek_off, guint8 *pd, int len);