From 72ce21927c42cddfaa7f06aabbb8a839630875e8 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Mon, 19 Jun 2017 16:58:23 -0700 Subject: [PATCH] Avoid explicit operator bool for error --- CHANGELOG.md | 1 + include/beast/websocket/impl/close.ipp | 2 +- include/beast/websocket/impl/read.ipp | 30 +++++++++++++------------- include/beast/websocket/impl/write.ipp | 16 +++++++------- 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06ee5a94..79e46a74 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ Version 62: * Doc fixes and tidy * Tidy up namespaces in examples * Clear the error faster +* Avoid explicit operator bool for error -------------------------------------------------------------------------------- diff --git a/include/beast/websocket/impl/close.ipp b/include/beast/websocket/impl/close.ipp index 43d68ef7..620c72e2 100644 --- a/include/beast/websocket/impl/close.ipp +++ b/include/beast/websocket/impl/close.ipp @@ -243,7 +243,7 @@ close(close_reason const& cr, error_code& ec) detail::frame_streambuf fb; write_close(fb, cr); boost::asio::write(stream_, fb.data(), ec); - failed_ = ec != 0; + failed_ = !!ec; } //------------------------------------------------------------------------------ diff --git a/include/beast/websocket/impl/read.ipp b/include/beast/websocket/impl/read.ipp index 9300b931..e4190585 100644 --- a/include/beast/websocket/impl/read.ipp +++ b/include/beast/websocket/impl/read.ipp @@ -295,7 +295,7 @@ operator()(error_code ec, detail::mask_inplace(in, d.key); auto const prev = d.db.size(); detail::inflate(d.ws.pmd_->zi, d.db, in, ec); - d.ws.failed_ = ec != 0; + d.ws.failed_ = !!ec; if(d.ws.failed_) break; if(d.remain == 0 && d.fh.fin) @@ -305,7 +305,7 @@ operator()(error_code ec, 0x00, 0x00, 0xff, 0xff }; detail::inflate(d.ws.pmd_->zi, d.db, buffer(&empty_block[0], 4), ec); - d.ws.failed_ = ec != 0; + d.ws.failed_ = !!ec; if(d.ws.failed_) break; } @@ -742,7 +742,7 @@ read_frame(DynamicBuffer& dynabuf, error_code& ec) { fb.commit(boost::asio::read( stream_, fb.prepare(2), ec)); - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return false; { @@ -753,14 +753,14 @@ read_frame(DynamicBuffer& dynabuf, error_code& ec) { fb.commit(boost::asio::read( stream_, fb.prepare(n), ec)); - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return false; } } read_fh2(fh, fb, code); - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return false; if(code != close_code::none) @@ -774,7 +774,7 @@ read_frame(DynamicBuffer& dynabuf, error_code& ec) auto const mb = fb.prepare( static_cast(fh.len)); fb.commit(boost::asio::read(stream_, mb, ec)); - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return false; if(fh.mask) @@ -796,7 +796,7 @@ read_frame(DynamicBuffer& dynabuf, error_code& ec) write_ping(fb, detail::opcode::pong, payload); boost::asio::write(stream_, fb.data(), ec); - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return false; continue; @@ -824,7 +824,7 @@ read_frame(DynamicBuffer& dynabuf, error_code& ec) wr_close_ = true; write_close(fb, cr); boost::asio::write(stream_, fb.data(), ec); - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return false; } @@ -859,7 +859,7 @@ read_frame(DynamicBuffer& dynabuf, error_code& ec) dynabuf.prepare(clamp(remain)); auto const bytes_transferred = stream_.read_some(b, ec); - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return false; BOOST_ASSERT(bytes_transferred > 0); @@ -891,7 +891,7 @@ read_frame(DynamicBuffer& dynabuf, error_code& ec) auto const bytes_transferred = stream_.read_some(buffer(rd_.buf.get(), clamp(remain, rd_.buf_size)), ec); - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return false; remain -= bytes_transferred; @@ -901,7 +901,7 @@ read_frame(DynamicBuffer& dynabuf, error_code& ec) detail::mask_inplace(in, key); auto const prev = dynabuf.size(); detail::inflate(pmd_->zi, dynabuf, in, ec); - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return false; if(remain == 0 && fh.fin) @@ -911,7 +911,7 @@ read_frame(DynamicBuffer& dynabuf, error_code& ec) 0x00, 0x00, 0xff, 0xff }; detail::inflate(pmd_->zi, dynabuf, buffer(&empty_block[0], 4), ec); - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return false; } @@ -951,7 +951,7 @@ do_close: detail::frame_streambuf fb; write_close(fb, code); boost::asio::write(stream_, fb.data(), ec); - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return false; } @@ -962,7 +962,7 @@ do_close: // http://stackoverflow.com/questions/25587403/boost-asio-ssl-async-shutdown-always-finishes-with-an-error ec.assign(0, ec.category()); } - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return false; ec = error::failed; @@ -980,7 +980,7 @@ do_close: } if(! ec) ec = error::closed; - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return false; return true; diff --git a/include/beast/websocket/impl/write.ipp b/include/beast/websocket/impl/write.ipp index 505e98a8..604727ef 100644 --- a/include/beast/websocket/impl/write.ipp +++ b/include/beast/websocket/impl/write.ipp @@ -416,7 +416,7 @@ operator()(error_code ec, d.ws.wr_.buf_size); auto const more = detail::deflate( d.ws.pmd_->zo, b, d.cb, d.fin, ec); - d.ws.failed_ = ec != 0; + d.ws.failed_ = !!ec; if(d.ws.failed_) goto upcall; auto const n = buffer_size(b); @@ -626,7 +626,7 @@ write_frame(bool fin, wr_.buf.get(), wr_.buf_size); auto const more = detail::deflate( pmd_->zo, b, cb, fin, ec); - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return; auto const n = buffer_size(b); @@ -654,7 +654,7 @@ write_frame(bool fin, wr_.cont = ! fin; boost::asio::write(stream_, buffer_cat(fh_buf.data(), b), ec); - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return; if(! more) @@ -682,7 +682,7 @@ write_frame(bool fin, wr_.cont = ! fin; boost::asio::write(stream_, buffer_cat(fh_buf.data(), buffers), ec); - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return; } @@ -704,7 +704,7 @@ write_frame(bool fin, boost::asio::write(stream_, buffer_cat(fh_buf.data(), buffer_prefix(n, cb)), ec); - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return; if(remain == 0) @@ -737,7 +737,7 @@ write_frame(bool fin, wr_.cont = ! fin; boost::asio::write(stream_, buffer_cat(fh_buf.data(), b), ec); - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return; } @@ -750,7 +750,7 @@ write_frame(bool fin, remain -= n; detail::mask_inplace(b, key); boost::asio::write(stream_, b, ec); - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return; } @@ -778,7 +778,7 @@ write_frame(bool fin, detail::write(fh_buf, fh); boost::asio::write(stream_, buffer_cat(fh_buf.data(), b), ec); - failed_ = ec != 0; + failed_ = !!ec; if(failed_) return; if(remain == 0)