X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=wiretap%2Ffile_wrappers.h;h=a51d7220564a9532115cda5b76296e6a19a6042e;hp=7be3b0b8d5a04bfa15b59fa116db1770dfa3f2a7;hb=6adf5370a8cd7fe2ad56e83f2b8ea6a1ee9874f6;hpb=c713417b0d8a4e62c5796f3ba838ac75a7b6e524

diff --git a/wiretap/file_wrappers.h b/wiretap/file_wrappers.h
index 7be3b0b8d5..a51d722056 100644
--- a/wiretap/file_wrappers.h
+++ b/wiretap/file_wrappers.h
@@ -1,20 +1,20 @@
 /* file_wrappers.h
  *
- * $Id: file_wrappers.h,v 1.5 2001/09/20 16:36:45 ashokn 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,31 +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)))
+/* XX: gzread and gzwrite return number of *bytes* (not number of elements) */
+#define file_read(buf, bsize, count, file) gzread((file),(buf),(unsigned)((count)*(bsize)))
 #define file_close gzclose
-extern long file_tell(void *stream);
-char * internal_gzgets(gzFile file, char *buf, int len);
-int internal_gzgetc(gzFile file);
-#define file_getc internal_gzgetc
-#define file_gets(buf, len, file) internal_gzgets((file), (buf), (len))
-extern int file_error(void *fh);
+#define file_getc gzgetc
+#define file_gets(buf, len, file) gzgets((file), (buf), (len))
+#define file_eof gzeof
 
 #else /* No zLib */
-#define file_open fopen
+
+#define file_open(path, mode) ws_fopen(path, mode)
 #define filed_open fdopen
-#define file_seek fseek
-#define file_read fread
-#define file_write fwrite
+/* XX: file_read defined to return number of *bytes* to be consistent with gzread */
+#define file_read(buf, bsize, count, file) ((bsize) * fread((buf), (bsize), (count), (file)))
 #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__ */