walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

h2load: Use std::string::size instead of strlen

This commit is contained in:
Tatsuhiro Tsujikawa 2015-07-19 18:37:41 +09:00
parent b37716ab6a
commit fa7a74cfa8
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/h2load.cc
View File

@ -911,17 +911,18 @@ std::vector<std::string> parse_uris(std::vector<std::string>::iterator first,
} }
auto uri = (*first).c_str(); auto uri = (*first).c_str();
++first;
// First URI is treated specially. We use scheme, host and port of // First URI is treated specially. We use scheme, host and port of
// this URI and ignore those in the remaining URIs if present. // this URI and ignore those in the remaining URIs if present.
http_parser_url u{}; http_parser_url u{};
if (http_parser_parse_url(uri, strlen(uri), 0, &u) != 0 || if (http_parser_parse_url(uri, (*first).size(), 0, &u) != 0 ||
!util::has_uri_field(u, UF_SCHEMA) || !util::has_uri_field(u, UF_HOST)) { !util::has_uri_field(u, UF_SCHEMA) || !util::has_uri_field(u, UF_HOST)) {
std::cerr << "invalid URI: " << uri << std::endl; std::cerr << "invalid URI: " << uri << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
++first;
config.scheme = util::get_uri_field(uri, u, UF_SCHEMA); config.scheme = util::get_uri_field(uri, u, UF_SCHEMA);
config.host = util::get_uri_field(uri, u, UF_HOST); config.host = util::get_uri_field(uri, u, UF_HOST);
config.default_port = util::get_default_port(uri, u); config.default_port = util::get_default_port(uri, u);
@ -938,7 +939,7 @@ std::vector<std::string> parse_uris(std::vector<std::string>::iterator first,
auto uri = (*first).c_str(); auto uri = (*first).c_str();
if (http_parser_parse_url(uri, strlen(uri), 0, &u) != 0) { if (http_parser_parse_url(uri, (*first).size(), 0, &u) != 0) {
std::cerr << "invalid URI: " << uri << std::endl; std::cerr << "invalid URI: " << uri << std::endl;
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }