summaryrefslogtreecommitdiff
path: root/pcapio.c
diff options
context:
space:
mode:
authorMichael Tüxen <tuexen@fh-muenster.de>2012-12-18 19:09:27 +0000
committerMichael Tüxen <tuexen@fh-muenster.de>2012-12-18 19:09:27 +0000
commit86925e10e15634f20141d2db9eca9f2b1dc42adc (patch)
tree35c7b1171bad1c894691fcb7d8aab0a3e52de181 /pcapio.c
parentf55922be77eb3f543a9503170340f8aeafdb41f9 (diff)
downloadwireshark-86925e10e15634f20141d2db9eca9f2b1dc42adc.tar.gz
fwrite() returns the number of objects written, not the number of bytes.
svn path=/trunk/; revision=46593
Diffstat (limited to 'pcapio.c')
-rw-r--r--pcapio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/pcapio.c b/pcapio.c
index acf4f462a3..30c509f084 100644
--- a/pcapio.c
+++ b/pcapio.c
@@ -181,7 +181,7 @@ struct option {
size_t nwritten; \
\
nwritten = fwrite(data_pointer, data_length, 1, file_pointer); \
- if (nwritten != data_length) { \
+ if (nwritten != 1) { \
if (nwritten == 0 && ferror(file_pointer)) { \
*error_pointer = errno; \
} else { \
@@ -224,7 +224,7 @@ libpcap_write_file_header(FILE *fp, int linktype, int snaplen, gboolean ts_nsecs
file_hdr.snaplen = snaplen;
file_hdr.network = linktype;
nwritten = fwrite(&file_hdr, sizeof(file_hdr), 1, fp);
- if (nwritten != sizeof(file_hdr)) {
+ if (nwritten != 1) {
if (nwritten == 0 && ferror(fp))
*err = errno;
else
@@ -250,7 +250,7 @@ libpcap_write_packet(FILE *fp, const struct pcap_pkthdr *phdr, const u_char *pd,
rec_hdr.incl_len = phdr->caplen;
rec_hdr.orig_len = phdr->len;
nwritten = fwrite(&rec_hdr, sizeof(rec_hdr), 1, fp);
- if (nwritten != sizeof rec_hdr) {
+ if (nwritten != 1) {
if (nwritten == 0 && ferror(fp))
*err = errno;
else
@@ -260,7 +260,7 @@ libpcap_write_packet(FILE *fp, const struct pcap_pkthdr *phdr, const u_char *pd,
*bytes_written += sizeof rec_hdr;
nwritten = fwrite(pd, phdr->caplen, 1, fp);
- if (nwritten != phdr->caplen) {
+ if (nwritten != 1) {
if (nwritten == 0 && ferror(fp))
*err = errno;
else