forked from osmocom/wireshark
fwrite() returns the number of objects written, not the number of bytes.
svn path=/trunk/; revision=46593
This commit is contained in:
parent
f55922be77
commit
86925e10e1
8
pcapio.c
8
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
|
||||
|
|
Loading…
Reference in New Issue