From 5dd87350b450f7aed847a8fbc3f67b5deadf65f3 Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Tue, 23 Jan 2018 18:39:53 -0500
Subject: [PATCH] ConvertToUnixSlashes: remove pos1
Instead of using two pointers to iterate through the string, iterate
using just one.
---
SystemTools.cxx | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 9c64d11..71d05ff 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -1890,14 +1890,13 @@ void SystemTools::ConvertToUnixSlashes(std::string& path)
ConvertVMSToUnix(path);
#else
const char* pos0 = pathCString;
- const char* pos1 = pathCString + 1;
for (std::string::size_type pos = 0; *pos0; ++pos) {
if (*pos0 == '\\') {
path[pos] = '/';
}
// Also, reuse the loop to check for slash followed by another slash
- if (!hasDoubleSlash && *pos1 == '/' && *(pos1 + 1) == '/') {
+ if (!hasDoubleSlash && *(pos0 + 1) == '/' && *(pos0 + 2) == '/') {
#ifdef _WIN32
// However, on windows if the first characters are both slashes,
// then keep them that way, so that network paths can be handled.
@@ -1910,7 +1909,6 @@ void SystemTools::ConvertToUnixSlashes(std::string& path)
}
pos0++;
- pos1++;
}
if (hasDoubleSlash) {
--
GitLab