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

Clear the error faster

Browse Source
This commit is contained in:
Vinnie Falco
2017-07-20 08:15:27 -07:00
parent fc09a4cad1
commit 4d393f4c2a
28 changed files with 117 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/http/basic_parser.cpp
+2 -2
View File
@@ -225,7 +225,7 @@ public:
error_code ec;
p.put(buffer(s.data(), i), ec);
BEAST_EXPECTS(ec == error::need_more, ec.message());
ec = {};
ec.assign(0, ec.category());
p.put(boost::asio::buffer(s.data(), s.size()), ec);
BEAST_EXPECTS(! ec, ec.message());
BEAST_EXPECT(p.is_done());
@@ -247,7 +247,7 @@ public:
error_code ec;
p.put(b1, ec);
BEAST_EXPECTS(ec == error::need_more, ec.message());
ec = {};
ec.assign(0, ec.category());
p.put(buffer_cat(b1, b2), ec);
BEAST_EXPECTS(! ec, ec.message());
p.put_eof(ec);
test/http/doc_snippets.cpp
+4 -4
View File
@@ -213,7 +213,7 @@ print_cxx14(message<isRequest, Body, Fields> const& m)
sr.get(ec,
[&sr](error_code& ec, auto const& buffer)
{
ec = {};
ec.assign(0, ec.category());
std::cout << buffers(buffer);
sr.consume(boost::asio::buffer_size(buffer));
});
@@ -240,7 +240,7 @@ struct lambda
template<class ConstBufferSequence>
void operator()(error_code& ec, ConstBufferSequence const& buffer) const
{
ec = {};
ec.assign(0, ec.category());
std::cout << buffers(buffer);
sr.consume(boost::asio::buffer_size(buffer));
}
@@ -281,7 +281,7 @@ split_print_cxx14(message<isRequest, Body, Fields> const& m)
sr.get(ec,
[&sr](error_code& ec, auto const& buffer)
{
ec = {};
ec.assign(0, ec.category());
std::cout << buffers(buffer);
sr.consume(boost::asio::buffer_size(buffer));
});
@@ -295,7 +295,7 @@ split_print_cxx14(message<isRequest, Body, Fields> const& m)
sr.get(ec,
[&sr](error_code& ec, auto const& buffer)
{
ec = {};
ec.assign(0, ec.category());
std::cout << buffers(buffer);
sr.consume(boost::asio::buffer_size(buffer));
});
test/http/parser.cpp
+4 -4
View File
@@ -95,7 +95,7 @@ public:
p.put(buffer(s.data(), n), ec);
s.remove_prefix(used);
if(ec == error::need_more)
ec = {};
ec.assign(0, ec.category());
if(! BEAST_EXPECTS(! ec, ec.message()))
continue;
BEAST_EXPECT(! p.is_done());
@@ -256,7 +256,7 @@ public:
used = p.put(b.data(), ec);
b.consume(used);
BEAST_EXPECT(ec == error::need_more);
ec = {};
ec.assign(0, ec.category());
BEAST_EXPECT(! p.is_done());
ostream(b) <<
"\r\n"; // final crlf to end message
@@ -300,7 +300,7 @@ public:
used = p.put(b.data(), ec);
BEAST_EXPECTS(ec == error::need_more, ec.message());
b.consume(used);
ec = {};
ec.assign(0, ec.category());
ostream(b) <<
"User-Agent: test\r\n"
"\r\n";
@@ -321,7 +321,7 @@ public:
BEAST_EXPECT(ec == error::need_more);
BEAST_EXPECT(! p.got_some());
BEAST_EXPECT(used == 0);
ec = {};
ec.assign(0, ec.category());
used = p.put(buf("G"), ec);
BEAST_EXPECT(ec == error::need_more);
BEAST_EXPECT(p.got_some());
test/http/parser_bench.cpp
+8 -8
View File
@@ -168,7 +168,7 @@ public:
on_request(verb, string_view,
string_view, int, error_code& ec)
{
ec = {};
ec.assign(0, ec.category());
}
void
@@ -176,34 +176,34 @@ public:
string_view,
int, error_code& ec)
{
ec = {};
ec.assign(0, ec.category());
}
void
on_field(field,
string_view, string_view, error_code& ec)
{
ec = {};
ec.assign(0, ec.category());
}
void
on_header(error_code& ec)
{
ec = {};
ec.assign(0, ec.category());
}
void
on_body(boost::optional<std::uint64_t> const&,
error_code& ec)
{
ec = {};
ec.assign(0, ec.category());
}
void
on_data(string_view,
error_code& ec)
{
ec = {};
ec.assign(0, ec.category());
}
void
@@ -211,13 +211,13 @@ public:
string_view,
error_code& ec)
{
ec = {};
ec.assign(0, ec.category());
}
void
on_complete(error_code& ec)
{
ec = {};
ec.assign(0, ec.category());
}
};
test/http/test_parser.hpp
+8 -8
View File
@@ -59,7 +59,7 @@ public:
if(fc_)
fc_->fail(ec);
else
ec = {};
ec.assign(0, ec.category());
}
void
@@ -75,7 +75,7 @@ public:
if(fc_)
fc_->fail(ec);
else
ec = {};
ec.assign(0, ec.category());
}
void
@@ -86,7 +86,7 @@ public:
if(fc_)
fc_->fail(ec);
else
ec = {};
ec.assign(0, ec.category());
}
void
@@ -96,7 +96,7 @@ public:
if(fc_)
fc_->fail(ec);
else
ec = {};
ec.assign(0, ec.category());
}
void
@@ -110,7 +110,7 @@ public:
if(fc_)
fc_->fail(ec);
else
ec = {};
ec.assign(0, ec.category());
}
void
@@ -121,7 +121,7 @@ public:
if(fc_)
fc_->fail(ec);
else
ec = {};
ec.assign(0, ec.category());
}
void
@@ -132,7 +132,7 @@ public:
if(fc_)
fc_->fail(ec);
else
ec = {};
ec.assign(0, ec.category());
}
void
@@ -142,7 +142,7 @@ public:
if(fc_)
fc_->fail(ec);
else
ec = {};
ec.assign(0, ec.category());
}
};
test/http/write.cpp
+6 -6
View File
@@ -57,13 +57,13 @@ public:
void
init(error_code& ec)
{
ec = {};
ec.assign(0, ec.category());
}
boost::optional<std::pair<const_buffers_type, bool>>
get(error_code& ec)
{
ec = {};
ec.assign(0, ec.category());
return {{const_buffers_type{
body_.data(), body_.size()}, false}};
}
@@ -71,7 +71,7 @@ public:
void
finish(error_code& ec)
{
ec = {};
ec.assign(0, ec.category());
}
};
};
@@ -112,13 +112,13 @@ public:
void
init(error_code& ec)
{
ec = {};
ec.assign(0, ec.category());
}
boost::optional<std::pair<const_buffers_type, bool>>
get(error_code& ec)
{
ec = {};
ec.assign(0, ec.category());
body_.read = true;
return get(
std::integral_constant<bool, isSplit>{},
@@ -128,7 +128,7 @@ public:
void
finish(error_code& ec)
{
ec = {};
ec.assign(0, ec.category());
}
private:
test/server/tests.cpp
+1 -1
View File
@@ -224,7 +224,7 @@ public:
con.shutdown(ec);
// VFALCO No idea why we get eof in the normal case
if(ec == boost::asio::error::eof)
ec = {};
ec.assign(0, ec.category());
if(! BEAST_EXPECTS(! ec, ec.message()))
return;
}