diff --git a/Makefile b/Makefile index d1b4bfd..1e1d157 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ example_simple: example_simple.o fastcgi.o fastcgi_conn.o fastcgi_request.o buffer.o - g++ -std=gnu++2a -o example_simple example_simple.o fastcgi.o fastcgi_conn.o fastcgi_request.o buffer.o -lgflags -lglog -lpthread + clang++ -std=gnu++2a -o example_simple example_simple.o fastcgi.o fastcgi_conn.o fastcgi_request.o buffer.o -lgflags -lglog -lpthread clean: rm --force exmaple_simple *.o .cpp.o: - g++ -std=gnu++2a -o $@ -c $< + clang++ -std=gnu++2a -Wall -Werror -o $@ -c $< diff --git a/example_simple b/example_simple index eb82546..a795eb9 100755 Binary files a/example_simple and b/example_simple differ diff --git a/fastcgi_conn.cpp b/fastcgi_conn.cpp index 6b375f2..fd2a8f9 100644 --- a/fastcgi_conn.cpp +++ b/fastcgi_conn.cpp @@ -100,10 +100,10 @@ void FastCGIConn::WriteBlock(uint8_t type, uint16_t request_id, const std::vecto content_length += vec.iov_len; } header.SetContentLength(content_length); - out_vecs.push_back(std::move(iovec{ + out_vecs.push_back(iovec{ .iov_base = &header, .iov_len = sizeof(header), - })); + }); for (auto& vec : vecs) { out_vecs.push_back(vec); @@ -121,10 +121,10 @@ void FastCGIConn::WriteEnd(uint16_t request_id, uint8_t status) { end.SetAppStatus(status); std::vector vecs; - vecs.push_back(std::move(iovec{ + vecs.push_back(iovec{ .iov_base = &end, .iov_len = sizeof(end), - })); + }); WriteBlock(3, request_id, vecs); } diff --git a/fastcgi_request.cpp b/fastcgi_request.cpp index a048cfa..6164083 100644 --- a/fastcgi_request.cpp +++ b/fastcgi_request.cpp @@ -9,7 +9,7 @@ FastCGIRequest::FastCGIRequest(uint16_t request_id, FastCGIConn* conn) conn_(conn) {} void FastCGIRequest::AddParam(const std::string_view& key, const std::string_view& value) { - params_.try_emplace(std::move(std::string(key)), std::move(std::string(value))); + params_.try_emplace(std::string(key), std::string(value)); } void FastCGIRequest::AddIn(const std::string_view& in) { @@ -27,37 +27,37 @@ void FastCGIRequest::Write(const std::vector(header.first.data()), .iov_len = header.first.size(), - })); - vecs.push_back(std::move(iovec{ + }); + vecs.push_back(iovec{ .iov_base = const_cast(": "), .iov_len = 2, - })); - vecs.push_back(std::move(iovec{ + }); + vecs.push_back(iovec{ .iov_base = const_cast(header.second.data()), .iov_len = header.second.size(), - })); - vecs.push_back(std::move(iovec{ + }); + vecs.push_back(iovec{ .iov_base = const_cast("\n"), .iov_len = 1, - })); + }); } if (!body.empty() && !body_sent_) { body_sent_ = true; - vecs.push_back(std::move(iovec{ + vecs.push_back(iovec{ .iov_base = const_cast("\n"), .iov_len = 1, - })); + }); } for (const auto& chunk : body) { - vecs.push_back(std::move(iovec{ + vecs.push_back(iovec{ .iov_base = const_cast(chunk.data()), .iov_len = chunk.size(), - })); + }); } conn_->WriteOutput(request_id_, vecs);