Browse Source

Removed get_header_value_int and use uint64_t for the return value of get_header_value_uint64

yhirose 6 years ago
parent
commit
8af85019dc
2 changed files with 6 additions and 13 deletions
  1. 1 8
      httplib.h
  2. 5 5
      test/test.cc

+ 1 - 8
httplib.h

@@ -781,14 +781,7 @@ inline const char *get_header_value(const Headers &headers, const char *key,
   return def;
   return def;
 }
 }
 
 
-inline int get_header_value_int(const Headers &headers, const char *key,
-                                int def = 0) {
-  auto it = headers.find(key);
-  if (it != headers.end()) { return std::stoi(it->second); }
-  return def;
-}
-
-inline unsigned long long get_header_value_uint64(const Headers &headers, const char *key,
+inline uint64_t get_header_value_uint64(const Headers &headers, const char *key,
 								int def = 0) {
 								int def = 0) {
 	auto it = headers.find(key);
 	auto it = headers.find(key);
 	if (it != headers.end()) {
 	if (it != headers.end()) {

+ 5 - 5
test/test.cc

@@ -72,8 +72,8 @@ TEST(GetHeaderValueTest, DefaultValue) {
 
 
 TEST(GetHeaderValueTest, DefaultValueInt) {
 TEST(GetHeaderValueTest, DefaultValueInt) {
   Headers headers = {{"Dummy", "Dummy"}};
   Headers headers = {{"Dummy", "Dummy"}};
-  auto val = detail::get_header_value_int(headers, "Content-Length", 100);
-  EXPECT_EQ(100, val);
+  auto val = detail::get_header_value_uint64(headers, "Content-Length", 100);
+  EXPECT_EQ(100ull, val);
 }
 }
 
 
 TEST(GetHeaderValueTest, RegularValue) {
 TEST(GetHeaderValueTest, RegularValue) {
@@ -84,8 +84,8 @@ TEST(GetHeaderValueTest, RegularValue) {
 
 
 TEST(GetHeaderValueTest, RegularValueInt) {
 TEST(GetHeaderValueTest, RegularValueInt) {
   Headers headers = {{"Content-Length", "100"}, {"Dummy", "Dummy"}};
   Headers headers = {{"Content-Length", "100"}, {"Dummy", "Dummy"}};
-  auto val = detail::get_header_value_int(headers, "Content-Length", 0);
-  EXPECT_EQ(100, val);
+  auto val = detail::get_header_value_uint64(headers, "Content-Length", 0);
+  EXPECT_EQ(100ull, val);
 }
 }
 
 
 TEST(GetHeaderValueTest, Range) {
 TEST(GetHeaderValueTest, Range) {
@@ -474,7 +474,7 @@ protected:
                EXPECT_EQ("value3", req.get_param_value("array", 2));
                EXPECT_EQ("value3", req.get_param_value("array", 2));
              })
              })
         .Post("/validate-no-multiple-headers",
         .Post("/validate-no-multiple-headers",
-              [&](const Request &req, Response &res) {
+              [&](const Request &req, Response & /*res*/) {
                 EXPECT_EQ(1u, req.get_header_value_count("Content-Length"));
                 EXPECT_EQ(1u, req.get_header_value_count("Content-Length"));
                 EXPECT_EQ("5", req.get_header_value("Content-Length"));
                 EXPECT_EQ("5", req.get_header_value("Content-Length"));
               })
               })