lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-04-20 11:47:43 +03:00
Code

Fix a few shadowed variable compilation warnings.

Browse Source
This commit is contained in:
Sam Hocevar 2020-02-17 06:58:30 +01:00
parent b251668522
commit 180aa32ebf
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
httplib.h
View File

@ -2069,11 +2069,11 @@ inline void parse_query_text(const std::string &s, Params &params) {
split(&s[0], &s[s.size()], '&', [&](const char *b, const char *e) { split(&s[0], &s[s.size()], '&', [&](const char *b, const char *e) {
std::string key; std::string key;
std::string val; std::string val;
split(b, e, '=', [&](const char *b, const char *e) { split(b, e, '=', [&](const char *b2, const char *e2) {
if (key.empty()) { if (key.empty()) {
key.assign(b, e); key.assign(b2, e2);
} else { } else {
val.assign(b, e); val.assign(b2, e2);
} }
}); });
params.emplace(key, decode_url(val)); params.emplace(key, decode_url(val));
@ -2099,16 +2099,16 @@ inline bool parse_range_header(const std::string &s, Ranges &ranges) {
split(&s[pos], &s[pos + len], ',', [&](const char *b, const char *e) { split(&s[pos], &s[pos + len], ',', [&](const char *b, const char *e) {
if (!all_valid_ranges) return; if (!all_valid_ranges) return;
static auto re_another_range = std::regex(R"(\s*(\d*)-(\d*))"); static auto re_another_range = std::regex(R"(\s*(\d*)-(\d*))");
std::cmatch m; std::cmatch cm;
if (std::regex_match(b, e, m, re_another_range)) { if (std::regex_match(b, e, cm, re_another_range)) {
ssize_t first = -1; ssize_t first = -1;
if (!m.str(1).empty()) { if (!cm.str(1).empty()) {
first = static_cast<ssize_t>(std::stoll(m.str(1))); first = static_cast<ssize_t>(std::stoll(cm.str(1)));
} }
ssize_t last = -1; ssize_t last = -1;
if (!m.str(2).empty()) { if (!cm.str(2).empty()) {
last = static_cast<ssize_t>(std::stoll(m.str(2))); last = static_cast<ssize_t>(std::stoll(cm.str(2)));
} }
if (first != -1 && last != -1 && first > last) { if (first != -1 && last != -1 && first > last) {
@ -2576,10 +2576,10 @@ inline std::pair<std::string, std::string> make_digest_authentication_header(
inline bool parse_www_authenticate(const httplib::Response &res, inline bool parse_www_authenticate(const httplib::Response &res,
std::map<std::string, std::string> &auth, std::map<std::string, std::string> &auth,
bool is_proxy) { bool is_proxy) {
auto key = is_proxy ? "Proxy-Authenticate" : "WWW-Authenticate"; auto auth_key = is_proxy ? "Proxy-Authenticate" : "WWW-Authenticate";
if (res.has_header(key)) { if (res.has_header(auth_key)) {
static auto re = std::regex(R"~((?:(?:,\s*)?(.+?)=(?:"(.*?)"|([^,]*))))~"); static auto re = std::regex(R"~((?:(?:,\s*)?(.+?)=(?:"(.*?)"|([^,]*))))~");
auto s = res.get_header_value(key); auto s = res.get_header_value(auth_key);
auto pos = s.find(' '); auto pos = s.find(' ');
if (pos != std::string::npos) { if (pos != std::string::npos) {
auto type = s.substr(0, pos); auto type = s.substr(0, pos);
@ -2710,11 +2710,11 @@ inline void Response::set_content(const std::string &s,
} }
inline void Response::set_content_provider( inline void Response::set_content_provider(
size_t length, size_t in_length,
std::function<void(size_t offset, size_t length, DataSink &sink)> provider, std::function<void(size_t offset, size_t length, DataSink &sink)> provider,
std::function<void()> resource_releaser) { std::function<void()> resource_releaser) {
assert(length > 0); assert(in_length > 0);
content_length = length; content_length = in_length;
content_provider = [provider](size_t offset, size_t length, DataSink &sink) { content_provider = [provider](size_t offset, size_t length, DataSink &sink) {
provider(offset, length, sink); provider(offset, length, sink);
}; };