diff options
| -rw-r--r-- | wiretap/file.c | 18 | ||||
| -rw-r--r-- | wiretap/libpcap.c | 10 |
2 files changed, 14 insertions, 14 deletions
diff --git a/wiretap/file.c b/wiretap/file.c index a10472984d..6a1ec8b154 100644 --- a/wiretap/file.c +++ b/wiretap/file.c @@ -1,6 +1,6 @@ /* file.c * - * $Id: file.c,v 1.22 1999/09/23 04:39:00 ashokn Exp $ + * $Id: file.c,v 1.23 1999/09/23 05:00:59 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu> @@ -165,10 +165,10 @@ wtap_dumper* wtap_dump_open(const char *filename, int filetype, int encap, { FILE *fh; - /* In case "file_open()" fails but doesn't set "errno", set "errno" + /* In case "fopen()" fails but doesn't set "errno", set "errno" to a generic "the open failed" error. */ errno = WTAP_ERR_CANT_OPEN; - fh = file_open(filename, "w"); + fh = fopen(filename, "w"); if (fh == NULL) { *err = errno; return NULL; /* can't create file */ @@ -181,10 +181,10 @@ wtap_dumper* wtap_dump_fdopen(int fd, int filetype, int encap, int snaplen, { FILE *fh; - /* In case "file_open()" fails but doesn't set "errno", set "errno" + /* In case "fopen()" fails but doesn't set "errno", set "errno" to a generic "the open failed" error. */ errno = WTAP_ERR_CANT_OPEN; - fh = filed_open(fd, "w"); + fh = fdopen(fd, "w"); if (fh == NULL) { *err = errno; return NULL; /* can't create standard I/O stream */ @@ -202,7 +202,7 @@ static wtap_dumper* wtap_dump_open_common(FILE *fh, int filetype, int encap, *err = errno; /* NOTE: this means the FD handed to "wtap_dump_fdopen()" will be closed if the malloc fails. */ - file_close(fh); + fclose(fh); return NULL; } wdh->fh = fh; @@ -226,7 +226,7 @@ static wtap_dumper* wtap_dump_open_common(FILE *fh, int filetype, int encap, fail: free(wdh); - file_close(fh); + fclose(fh); return NULL; /* XXX - provide a reason why we failed */ } @@ -248,10 +248,10 @@ int wtap_dump_close(wtap_dumper *wdh, int *err) if (!(wdh->subtype_close)(wdh, err)) ret = 0; errno = WTAP_ERR_CANT_CLOSE; - if (file_close(wdh->fh) == EOF) { + if (fclose(wdh->fh) == EOF) { if (ret) { /* The per-format close function succeeded, - but the file_close didn't. Save the reason + but the fclose didn't. Save the reason why, if our caller asked for it. */ if (err != NULL) *err = errno; diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 437b641191..4301c01b90 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -1,6 +1,6 @@ /* libpcap.c * - * $Id: libpcap.c,v 1.18 1999/09/22 01:26:47 ashokn Exp $ + * $Id: libpcap.c,v 1.19 1999/09/23 05:00:59 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu> @@ -351,7 +351,7 @@ int libpcap_dump_open(wtap_dumper *wdh, int *err) wdh->subtype_close = libpcap_dump_close; /* Write the file header. */ - nwritten = file_write(&pcap_magic, 1, sizeof pcap_magic, wdh->fh); + nwritten = fwrite(&pcap_magic, 1, sizeof pcap_magic, wdh->fh); if (nwritten != sizeof pcap_magic) { if (nwritten < 0) *err = errno; @@ -367,7 +367,7 @@ int libpcap_dump_open(wtap_dumper *wdh, int *err) file_hdr.sigfigs = 0; /* unknown, but also apparently unused */ file_hdr.snaplen = wdh->snaplen; file_hdr.network = wtap_encap[wdh->encap]; - nwritten = file_write(&file_hdr, 1, sizeof file_hdr, wdh->fh); + nwritten = fwrite(&file_hdr, 1, sizeof file_hdr, wdh->fh); if (nwritten != sizeof file_hdr) { if (nwritten < 0) *err = errno; @@ -391,7 +391,7 @@ static int libpcap_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, rec_hdr.ts_usec = phdr->ts.tv_usec; rec_hdr.incl_len = phdr->caplen; rec_hdr.orig_len = phdr->len; - nwritten = file_write(&rec_hdr, 1, sizeof rec_hdr, wdh->fh); + nwritten = fwrite(&rec_hdr, 1, sizeof rec_hdr, wdh->fh); if (nwritten != sizeof rec_hdr) { if (nwritten < 0) *err = errno; @@ -399,7 +399,7 @@ static int libpcap_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr, *err = WTAP_ERR_SHORT_WRITE; return 0; } - nwritten = file_write(pd, 1, phdr->caplen, wdh->fh); + nwritten = fwrite(pd, 1, phdr->caplen, wdh->fh); if (nwritten != phdr->caplen) { if (nwritten < 0) *err = errno; |