aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/file_access.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2011-04-08 00:28:37 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2011-04-08 00:28:37 +0000
commit48ce499439b76824a12731af9bb0358ce32bb0c7 (patch)
tree19edd070267f48bb82aa4b554762f918be830f26 /wiretap/file_access.c
parentb102ea2723be018eeffff9b0479c03318959fb8c (diff)
From Jakub Zawadzki:
Steal file_wrappers functions from zlib v2. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@36513 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wiretap/file_access.c')
-rw-r--r--wiretap/file_access.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c
index 60a4eac110..9ac254a27f 100644
--- a/wiretap/file_access.c
+++ b/wiretap/file_access.c
@@ -768,15 +768,15 @@ static wtap_dumper* wtap_dump_alloc_wdh(int filetype, int encap, int snaplen,
gboolean compressed, int *err);
static gboolean wtap_dump_open_finish(wtap_dumper *wdh, int filetype, gboolean compressed, int *err);
-static FILE_T wtap_dump_file_open(wtap_dumper *wdh, const char *filename);
-static FILE_T wtap_dump_file_fdopen(wtap_dumper *wdh, int fd);
+static WFILE_T wtap_dump_file_open(wtap_dumper *wdh, const char *filename);
+static WFILE_T wtap_dump_file_fdopen(wtap_dumper *wdh, int fd);
static int wtap_dump_file_close(wtap_dumper *wdh);
wtap_dumper* wtap_dump_open(const char *filename, int filetype, int encap,
int snaplen, gboolean compressed, int *err)
{
wtap_dumper *wdh;
- FILE_T fh;
+ WFILE_T fh;
/* Check whether we can open a capture file with that file type
and that encapsulation. */
@@ -828,7 +828,7 @@ wtap_dumper* wtap_dump_fdopen(int fd, int filetype, int encap, int snaplen,
gboolean compressed, int *err)
{
wtap_dumper *wdh;
- FILE_T fh;
+ WFILE_T fh;
/* Check whether we can open a capture file with that file type
and that encapsulation. */
@@ -1010,7 +1010,7 @@ gboolean wtap_dump_set_addrinfo_list(wtap_dumper *wdh, struct addrinfo *addrinfo
/* internally open a file for writing (compressed or not) */
#ifdef HAVE_LIBZ
-static FILE_T wtap_dump_file_open(wtap_dumper *wdh, const char *filename)
+static WFILE_T wtap_dump_file_open(wtap_dumper *wdh, const char *filename)
{
if(wdh->compressed) {
return gzopen(filename, "wb");
@@ -1019,7 +1019,7 @@ static FILE_T wtap_dump_file_open(wtap_dumper *wdh, const char *filename)
}
}
#else
-static FILE_T wtap_dump_file_open(wtap_dumper *wdh _U_, const char *filename)
+static WFILE_T wtap_dump_file_open(wtap_dumper *wdh _U_, const char *filename)
{
return ws_fopen(filename, "wb");
}
@@ -1027,7 +1027,7 @@ static FILE_T wtap_dump_file_open(wtap_dumper *wdh _U_, const char *filename)
/* internally open a file for writing (compressed or not) */
#ifdef HAVE_LIBZ
-static FILE_T wtap_dump_file_fdopen(wtap_dumper *wdh, int fd)
+static WFILE_T wtap_dump_file_fdopen(wtap_dumper *wdh, int fd)
{
if(wdh->compressed) {
return gzdopen(fd, "wb");
@@ -1036,7 +1036,7 @@ static FILE_T wtap_dump_file_fdopen(wtap_dumper *wdh, int fd)
}
}
#else
-static FILE_T wtap_dump_file_fdopen(wtap_dumper *wdh _U_, int fd)
+static WFILE_T wtap_dump_file_fdopen(wtap_dumper *wdh _U_, int fd)
{
return fdopen(fd, "wb");
}