use const char* instead of const std::string& in normalize()

pull/4016/head
Jeffrey Quesnelle 7 years ago
parent b32c2a80e0
commit f5b086273a
  1. 10
      src/google/protobuf/stubs/io_win32.cc

@ -155,13 +155,13 @@ string normalize(string path) {
static const string dot("."); static const string dot(".");
static const string dotdot(".."); static const string dotdot("..");
const string& cpath = path; const char *p = path.c_str();
std::vector<string> segments; std::vector<string> segments;
int segment_start = -1; int segment_start = -1;
// Find the path segments in `path` (separated by "/"). // Find the path segments in `path` (separated by "/").
for (int i = 0;; ++i) { for (int i = 0;; ++i) {
if (!is_separator(cpath[i]) && cpath[i] != '\0') { if (!is_separator(p[i]) && p[i] != '\0') {
// The current character does not end a segment, so start one unless it's // The current character does not end a segment, so start one unless it's
// already started. // already started.
if (segment_start < 0) { if (segment_start < 0) {
@ -170,7 +170,7 @@ string normalize(string path) {
} else if (segment_start >= 0 && i > segment_start) { } else if (segment_start >= 0 && i > segment_start) {
// The current character is "/" or "\0", so this ends a segment. // The current character is "/" or "\0", so this ends a segment.
// Add that to `segments` if there's anything to add; handle "." and "..". // Add that to `segments` if there's anything to add; handle "." and "..".
string segment(cpath, segment_start, i - segment_start); string segment(p, segment_start, i - segment_start);
segment_start = -1; segment_start = -1;
if (segment == dotdot) { if (segment == dotdot) {
if (!segments.empty() && if (!segments.empty() &&
@ -181,7 +181,7 @@ string normalize(string path) {
segments.push_back(segment); segments.push_back(segment);
} }
} }
if (cpath[i] == '\0') { if (p[i] == '\0') {
break; break;
} }
} }
@ -204,7 +204,7 @@ string normalize(string path) {
result << segments[i]; result << segments[i];
} }
// Preserve trailing separator if the input contained it. // Preserve trailing separator if the input contained it.
if (!cpath.empty() && is_separator(cpath[cpath.size() - 1])) { if (!path.empty() && is_separator(p[path.size() - 1])) {
result << '\\'; result << '\\';
} }
return result.str(); return result.str();

Loading…
Cancel
Save