feedc0de/boost_beast
1
0
Fork 0
forked from boostorg/beast
Code Pull Requests Activity

Use fwrite return value in file_body

Browse Source
This commit is contained in:
Vinnie Falco
2017-04-10 19:29:35 -07:00
parent 5bb5f62b9a
commit a595c3ba85
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,6 +1,7 @@
1.0.0-b33 1.0.0-b33
* Require Visual Studio 2015 Update 3 or later * Require Visual Studio 2015 Update 3 or later
* Use fwrite return value in file_body
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

9
examples/file_body.hpp
View File

@@ -11,6 +11,7 @@
#include <beast/core/error.hpp> #include <beast/core/error.hpp>
#include <beast/http/message.hpp> #include <beast/http/message.hpp>
#include <boost/asio/buffer.hpp> #include <boost/asio/buffer.hpp>
#include <boost/assert.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <cstdio> #include <cstdio>
#include <cstdint> #include <cstdint>
@@ -74,15 +75,17 @@ struct file_body
size_ - offset_); size_ - offset_);
else else
buf_len_ = sizeof(buf_); buf_len_ = sizeof(buf_);
auto const nread = fread(buf_, 1, sizeof(buf_), file_); auto const nread = fread(
buf_, 1, sizeof(buf_), file_);
if(ferror(file_)) if(ferror(file_))
{ {
ec = error_code(errno, ec = error_code(errno,
system_category()); system_category());
return true; return true;
} }
offset_ += buf_len_; BOOST_ASSERT(nread != 0);
wf(boost::asio::buffer(buf_, buf_len_)); offset_ += nread;
wf(boost::asio::buffer(buf_, nread));
return offset_ >= size_; return offset_ >= size_;
} }
}; };