Make FT_STRINGZ items work as apply/prepare as filter menu items

[obnox/wireshark/wip.git] / wiretap / file_wrappers.h

diff --git a/wiretap/file_wrappers.h b/wiretap/file_wrappers.h
index 61c5376a90e646063aa4c2d243b62c14a497bd44..9dcf643ff616ab22c04c2526516f7bfac2c3f6c4 100644 (file)
--- a/wiretap/file_wrappers.h
+++ b/wiretap/file_wrappers.h
@@ -1,20 +1,20 @@
 /* file_wrappers.h
  *
- * $Id: file_wrappers.h,v 1.4 2000/01/26 19:22:04 guy Exp $
+ * $Id$
  *
  * Wiretap Library
- * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
- * 
+ * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * 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.
@@ -24,29 +24,32 @@
 #ifndef __FILE_H__
 #define __FILE_H__
 
+extern gint64 file_seek(void *stream, gint64 offset, int whence, int *err);
+extern gint64 file_tell(void *stream);
+extern int file_error(void *fh);
+
 #ifdef HAVE_LIBZ
-#define file_open gzopen
+
+extern FILE_T file_open(const char *path, const char *mode);
 #define filed_open gzdopen
-extern long file_seek(void *stream, long offset, int whence);
 #define file_read(buf, bsize, count, file) gzread((file),(buf),((count)*(bsize)))
 #define file_write(buf, bsize, count, file) gzwrite((file),(buf),((count)*(bsize)))
 #define file_close gzclose
-extern long file_tell(void *stream);
 #define file_getc gzgetc
 #define file_gets(buf, len, file) gzgets((file), (buf), (len))
-extern int file_error(void *fh);
+#define file_eof gzeof
 
 #else /* No zLib */
-#define file_open fopen
+/* XXX - mixing eth_xxx and fxxx calls might not be a good idea with MSVC 2005! */
+#define file_open(path, mode) eth_fopen(path, mode)
 #define filed_open fdopen
-#define file_seek fseek
 #define file_read fread
 #define file_write fwrite
 #define file_close fclose
-extern int file_error(FILE *fh);
-#define file_tell ftell
 #define file_getc fgetc
 #define file_gets fgets
+#define file_eof feof
+
 #endif /* HAVE_LIBZ */
 
 #endif /* __FILE_H__ */