From e90244e99282fbf5323e729c68be05185c95c2b1 Mon Sep 17 00:00:00 2001 From: yhirose Date: Sun, 3 Dec 2017 08:17:05 -0500 Subject: [PATCH] Fixed compiler warings (with -Wall and -Wextra) --- httplib.h | 4 ++-- test/Makefile | 2 +- test/test.cc | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/httplib.h b/httplib.h index fe8ec38..4bdc347 100644 --- a/httplib.h +++ b/httplib.h @@ -254,7 +254,7 @@ void split(const char* b, const char* e, char d, Fn fn) } } -inline bool socket_gets(Stream& strm, char* buf, int bufsiz) +inline bool socket_gets(Stream& strm, char* buf, size_t bufsiz) { // TODO: buffering for better performance size_t i = 0; @@ -299,7 +299,7 @@ inline void socket_printf(Stream& strm, const char* fmt, const Args& ...args) if (n >= BUFSIZ) { std::vector glowable_buf(BUFSIZ); - while (n >= glowable_buf.size()) { + while (n >= static_cast(glowable_buf.size())) { glowable_buf.resize(glowable_buf.size() * 2); n = snprintf(&glowable_buf[0], glowable_buf.size(), fmt, args...); } diff --git a/test/Makefile b/test/Makefile index 76809f3..9a78dda 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,6 +1,6 @@ CC = clang++ -CFLAGS = -std=c++14 -DGTEST_USE_OWN_TR1_TUPLE -I.. -I. +CFLAGS = -std=c++14 -DGTEST_USE_OWN_TR1_TUPLE -I.. -I. -Wall -Wextra #OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include -L/usr/local/opt/openssl/lib -lssl -lcrypto all : test diff --git a/test/test.cc b/test/test.cc index 58fae80..0cdc471 100644 --- a/test/test.cc +++ b/test/test.cc @@ -121,10 +121,10 @@ protected: virtual void SetUp() { svr_.set_base_dir("./www"); - svr_.get("/hi", [&](const Request& req, Response& res) { + svr_.get("/hi", [&](const Request& /*req*/, Response& res) { res.set_content("Hello World!", "text/plain"); }) - .get("/", [&](const Request& req, Response& res) { + .get("/", [&](const Request& /*req*/, Response& res) { res.set_redirect("/hi"); }) .post("/person", [&](const Request& req, Response& res) { @@ -143,7 +143,7 @@ protected: res.status = 404; } }) - .get("/stop", [&](const Request& req, Response& res) { + .get("/stop", [&](const Request& /*req*/, Response& /*res*/) { svr_.stop(); }); @@ -410,11 +410,11 @@ protected: , up_(false) {} virtual void SetUp() { - svr_.get("/hi", [&](const Request& req, Response& res) { + svr_.get("/hi", [&](const Request& /*req*/, Response& res) { res.set_content("Hello World!", "text/plain"); }); - svr_.get("/stop", [&](const Request& req, Response& res) { + svr_.get("/stop", [&](const Request& /*req*/, Response& /*res*/) { svr_.stop(); });