Unverified Commit 40872f02 authored by Dennis Jenkins's avatar Dennis Jenkins Committed by GitHub

Merge pull request #300 from knowledge4igor/code_improvements_2

Tiny code improvements
parents e4c43797 0d305e36
...@@ -693,16 +693,7 @@ namespace Private { ...@@ -693,16 +693,7 @@ namespace Private {
ParserBase() ParserBase()
: cursor(&buffer) : cursor(&buffer)
, currentStep(0) , currentStep(0)
{ { }
}
ParserBase(const char* data, size_t len)
: cursor(&buffer)
, currentStep(0)
{
UNUSED(data)
UNUSED(len)
}
ParserBase(const ParserBase& other) = delete; ParserBase(const ParserBase& other) = delete;
ParserBase(ParserBase&& other) = default; ParserBase(ParserBase&& other) = default;
......
...@@ -579,8 +579,7 @@ Connection::performImpl( ...@@ -579,8 +579,7 @@ Connection::performImpl(
transport_->asyncSendRequest(shared_from_this(), timer, buffer).then( transport_->asyncSendRequest(shared_from_this(), timer, buffer).then(
[=](ssize_t bytes) mutable { [=](ssize_t) mutable {
UNUSED(bytes)
inflightRequests.push_back(RequestEntry(std::move(resolveMover), std::move(rejectMover), std::move(timer), std::move(onDone))); inflightRequests.push_back(RequestEntry(std::move(resolveMover), std::move(rejectMover), std::move(timer), std::move(onDone)));
}, },
[=](std::exception_ptr e) { rejectCloneMover.val(e); }); [=](std::exception_ptr e) { rejectCloneMover.val(e); });
......
...@@ -740,8 +740,7 @@ serveFile(ResponseWriter& response, const char* fileName, const Mime::MediaType& ...@@ -740,8 +740,7 @@ serveFile(ResponseWriter& response, const char* fileName, const Mime::MediaType&
auto sockFd = peer->fd(); auto sockFd = peer->fd();
auto buffer = buf->buffer(); auto buffer = buf->buffer();
return transport->asyncWrite(sockFd, buffer, MSG_MORE).then([=](ssize_t bytes) { return transport->asyncWrite(sockFd, buffer, MSG_MORE).then([=](ssize_t) {
UNUSED(bytes)
return transport->asyncWrite(sockFd, FileBuffer(fileName)); return transport->asyncWrite(sockFd, FileBuffer(fileName));
}, Async::Throw); }, Async::Throw);
......
...@@ -30,6 +30,9 @@ FileBuffer::FileBuffer(const std::string& fileName) ...@@ -30,6 +30,9 @@ FileBuffer::FileBuffer(const std::string& fileName)
void void
FileBuffer::init(const char* fileName) FileBuffer::init(const char* fileName)
{ {
if (!fileName) {
throw std::runtime_error("Missing fileName");
}
int fd = open(fileName, O_RDONLY); int fd = open(fileName, O_RDONLY);
if (fd == -1) { if (fd == -1) {
throw std::runtime_error("Could not open file"); throw std::runtime_error("Could not open file");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment