osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Simplify code. 

svn path=/trunk/; revision=46594
This commit is contained in:
Michael Tüxen 2012-12-18 19:16:11 +00:00
parent 86925e10e1
commit 3895df85aa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcapio.c
View File

@ -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 */