Skip to content
This repository has been archived by the owner on Jun 30, 2021. It is now read-only.

Commit

Permalink
BUGFIX: Fix warnings from GCC and Clang
Browse files Browse the repository at this point in the history
  • Loading branch information
@jpihl
jpihl committed Mar 23, 2018
1 parent 6288e52 commit 4fba2e9
Show file tree
Hide file tree
Showing 15 changed files with 265 additions and 227 deletions.
6 changes: 3 additions & 3 deletions src/served/methods_handler.test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ TEST_CASE("test methods handling", "[methods_handler]")
{
SECTION("create handlers")
{
auto dummy = [](served::response & res, const served::request & req) {};
auto dummy = [](served::response &, const served::request &) {};

served::methods_handler h("/dummy");
h.post(dummy).get(dummy).method(served::method::CONNECT, dummy).put(dummy);
Expand All @@ -57,7 +57,7 @@ TEST_CASE("test methods handling", "[methods_handler]")

SECTION("check endpoint propagation no description")
{
auto dummy = [](served::response & res, const served::request & req) {};
auto dummy = [](served::response &, const served::request &) {};

served::methods_handler h("/this/path/is/great");
h.post(dummy).get(dummy).method(served::method::CONNECT, dummy).put(dummy);
Expand All @@ -81,7 +81,7 @@ TEST_CASE("test methods handling", "[methods_handler]")

SECTION("check endpoint propagation with description")
{
auto dummy = [](served::response & res, const served::request & req) {};
auto dummy = [](served::response &, const served::request &) {};

served::methods_handler h("/this/path/is/great", "This is an endpoint for great stuff");
h.get(dummy).put(dummy).del(dummy);
Expand Down
5 changes: 3 additions & 2 deletions src/served/multiplexer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ split_path(const std::string & path)
const char * path_ptr = path.c_str();
const size_t path_len = path.length();

char tmp[path.length()];
char * const tmp = new char[path.length()];
char * end = tmp;

const char * const eol = path_ptr + path_len;
Expand Down Expand Up @@ -101,7 +101,7 @@ split_path(const std::string & path)
// Push back an empty string for paths ending in /
chunks.push_back("");
}

delete[] tmp;
return chunks;
}

Expand Down Expand Up @@ -298,6 +298,7 @@ served_req_handler
multiplexer::get_endpoint_list_handler_YAML()
{
return [this](served::response & res, const served::request & req) {
(void) req;
res.set_header("Content-Type", "text/yaml");

res << "%YAML 1.2\n---";
Expand Down
32 changes: 18 additions & 14 deletions src/served/multiplexer.test.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ class path_collecting_functor

void operator()(served::response & response, const served::request & request)
{
(void) response;
_story_obj.received.push_back(request.url().path());
_story_obj.params = request.params;
}
Expand Down Expand Up @@ -340,8 +341,8 @@ TEST_CASE("multiplexer hierarchy test", "[mux]")
{
bool correct_call = false;

auto dummy_call = [&](served::response & res, const served::request & req) {};
auto expected_call = [&](served::response & res, const served::request & req) {
auto dummy_call = [&](served::response &, const served::request &) {};
auto expected_call = [&](served::response &, const served::request &) {
correct_call = true;
};

Expand All @@ -367,8 +368,8 @@ TEST_CASE("multiplexer hierarchy test", "[mux]")
{
bool correct_call = false;

auto dummy_call = [&](served::response & res, const served::request & req) {};
auto expected_call = [&](served::response & res, const served::request & req) {
auto dummy_call = [&](served::response &, const served::request &) {};
auto expected_call = [&](served::response &, const served::request &) {
correct_call = true;
};

Expand Down Expand Up @@ -421,9 +422,11 @@ TEST_CASE("multiplexer test base path", "[mux]")
{
served::multiplexer mux("/base/path");
mux.handle("/end").get([](served::response & res, const served::request & req){
(void) req;
res.set_status(served::status_2XX::ACCEPTED);
});
mux.handle("/").get([](served::response & res, const served::request & req){
(void) req;
res.set_status(served::status_2XX::NO_CONTENT);
});

Expand Down Expand Up @@ -468,6 +471,7 @@ TEST_CASE("multiplexer test base path", "[mux]")
{
served::multiplexer mux("/base/{TEST}");
mux.handle("/end").get([](served::response & res, const served::request & req) {
(void) req;
res.set_status(served::status_2XX::OK);
});

Expand All @@ -492,19 +496,19 @@ TEST_CASE("multiplexer test plugins", "[mux]")
int touches = 0;
served::multiplexer mux;
mux.handle("/test")
.get([&](served::response & res, const served::request & req) {
.get([&](served::response &, const served::request &) {
if ( touches == 1 )
{
touches++;
}
});
mux.use_before([&](served::response & res, const served::request & req) {
mux.use_before([&](served::response &, const served::request &) {
if ( touches == 0 )
{
touches++;
}
});
mux.use_after([&](served::response & res, const served::request & req) {
mux.use_after([&](served::response &, const served::request &) {
if ( touches == 2 )
{
touches++;
Expand Down Expand Up @@ -534,28 +538,28 @@ TEST_CASE("multiplexer test wrapped plugins", "[mux]")
served::multiplexer mux;

mux.handle("/test")
.get([&](served::response & res, const served::request & req) {
.get([&](served::response &, const served::request &) {
if ( touches == 3 )
{
touches++;
}
});

mux.use_wrapper([&](served::response & res, served::request & req, std::function<void()> func) {
mux.use_wrapper([&](served::response &, served::request &, std::function<void()> func) {
if ( touches == 0 )
{
touches++;
}
func();
});
mux.use_wrapper([&](served::response & res, served::request & req, std::function<void()> func) {
mux.use_wrapper([&](served::response &, served::request &, std::function<void()> func) {
if ( touches == 1 )
{
touches++;
}
func();
});
mux.use_wrapper([&](served::response & res, served::request & req, std::function<void()> func) {
mux.use_wrapper([&](served::response &, served::request &, std::function<void()> func) {
if ( touches == 2 )
{
touches++;
Expand Down Expand Up @@ -595,7 +599,7 @@ TEST_CASE("multiplexer test endpoint list", "[mux]")
{
SECTION("without base path")
{
auto dummy = [](served::response & res, const served::request & req){};
auto dummy = [](served::response &, const served::request &){};

served::multiplexer mux;
mux.handle("/first/test", "This is first").get(dummy).post(dummy).del(dummy);
Expand Down Expand Up @@ -647,7 +651,7 @@ TEST_CASE("multiplexer test endpoint list", "[mux]")

SECTION("with base path")
{
auto dummy = [](served::response & res, const served::request & req){};
auto dummy = [](served::response &, const served::request &){};

served::multiplexer mux("/base/path");
mux.handle("/first/test", "This is first").get(dummy).post(dummy).del(dummy);
Expand Down Expand Up @@ -702,7 +706,7 @@ TEST_CASE("multiplexer endpoint list YAML", "[mux]")
{
SECTION("request router stories")
{
auto dummy = [](served::response & res, const served::request & req){};
auto dummy = [](served::response &, const served::request &){};

served::multiplexer mux;
mux.handle("/first/test", "This is first").get(dummy).post(dummy).del(dummy);
Expand Down
6 changes: 5 additions & 1 deletion src/served/mux/empty_matcher.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ class empty_matcher : public segment_matcher
*/
virtual bool check_match(const std::string & path_segment) override
{
(void) path_segment;
return true;
}

Expand All @@ -58,7 +59,10 @@ class empty_matcher : public segment_matcher
* @param path_segment the segment of path the variable should be extracted from
*/
virtual void get_param(served::parameters & params, const std::string & path_segment) override
{}
{
(void) params;
(void) path_segment;
}
};

} } // mux, served
Expand Down
2 changes: 2 additions & 0 deletions src/served/mux/static_matcher.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ static_matcher::check_match(const std::string & path_segment)
void
static_matcher::get_param(served::parameters & params, const std::string & path_segment)
{
(void) path_segment;
(void) params;
}

} } // mux, served
2 changes: 1 addition & 1 deletion src/served/request.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ request::url()

// ----- component accessors -----

const enum method
enum method
request::method() const
{
return _method;
Expand Down
2 changes: 1 addition & 1 deletion src/served/request.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ class request
*
* @return HTTP method of the request
*/
const enum method method() const;
enum method method() const;

/*
* Get the URL of this request.
Expand Down
Loading

0 comments on commit 4fba2e9

Please sign in to comment.