aboutsummaryrefslogtreecommitdiffstats
path: root/pcapio.c
diff options
context:
space:
mode:
authorMichael Tüxen <tuexen@fh-muenster.de>2012-12-18 19:16:11 +0000
committerMichael Tüxen <tuexen@fh-muenster.de>2012-12-18 19:16:11 +0000
commit3895df85aa5e3d40e7c75e23d228f2227ba00065 (patch)
tree8e8ea289397265d194e989a292813404cabd8fa9 /pcapio.c
parent86925e10e15634f20141d2db9eca9f2b1dc42adc (diff)
Simplify code.
svn path=/trunk/; revision=46594
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 30c509f084..01d1eb5cdd 100644
--- a/pcapio.c
+++ b/pcapio.c
@@ -182,7 +182,7 @@ struct option {
\
nwritten = fwrite(data_pointer, data_length, 1, file_pointer); \
if (nwritten != 1) { \
- if (nwritten == 0 && ferror(file_pointer)) { \
+ if (ferror(file_pointer)) { \
*error_pointer = errno; \
} else { \
*error_pointer = 0; \
@@ -225,7 +225,7 @@ libpcap_write_file_header(FILE *fp, int linktype, int snaplen, gboolean ts_nsecs
file_hdr.network = linktype;
nwritten = fwrite(&file_hdr, sizeof(file_hdr), 1, fp);
if (nwritten != 1) {
- if (nwritten == 0 && ferror(fp))
+ if (ferror(fp))
*err = errno;
else
*err = 0; /* short write */
@@ -251,7 +251,7 @@ libpcap_write_packet(FILE *fp, const struct pcap_pkthdr *phdr, const u_char *pd,
rec_hdr.orig_len = phdr->len;
nwritten = fwrite(&rec_hdr, sizeof(rec_hdr), 1, fp);
if (nwritten != 1) {
- if (nwritten == 0 && ferror(fp))
+ if (ferror(fp))
*err = errno;
else
*err = 0; /* short write */
@@ -261,7 +261,7 @@ libpcap_write_packet(FILE *fp, const struct pcap_pkthdr *phdr, const u_char *pd,
nwritten = fwrite(pd, phdr->caplen, 1, fp);
if (nwritten != 1) {
- if (nwritten == 0 && ferror(fp))
+ if (ferror(fp))
*err = errno;
else
*err = 0; /* short write */