Simplify code.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@46594 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/pcapio.c b/pcapio.c
index 30c509f0840ac7788adb3cd6c853b2e12ee2a8e1..01d1eb5cdd444faa2a2e0c9533a3be3dc48b8521 100644 (file)
--- 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 */