linux: refactor some delimiter repaces

OpenXRay · Nov 6, 2018 · 9cbcdb2 · 9cbcdb2
1 parent 1c77f0b
commit 9cbcdb2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/src/xrCore/LocatorAPI.cpp b/src/xrCore/LocatorAPI.cpp
@@ -434,11 +434,7 @@ void CLocatorAPI::LoadArchive(archive& A, pcstr entrypoint)
 
         strconcat(sizeof full, full, fs_entry_point, name);
 #if defined(LINUX)
-        char *tmp_ptr = strchr(full, '\\');
-        while (tmp_ptr) {
-            *tmp_ptr = '/';
-            tmp_ptr = strchr(tmp_ptr, '\\');
-        }
+        while (char* sep = strchr(full, '\\')) *sep = '/';
 #endif
         Register(full, A.vfs_idx, crc, ptr, size_real, size_compr, 0);
     }

diff --git a/src/xrCore/LocatorAPI_defs.cpp b/src/xrCore/LocatorAPI_defs.cpp
@@ -48,11 +48,7 @@ FS_Path::FS_Path(LPCSTR _Root, LPCSTR _Add, LPCSTR _DefExt, LPCSTR _FilterCaptio
     if (_Add)
         xr_strcat(temp, _Add);
 #if defined(LINUX)
-    char *ptr = strchr(temp, '\\');
-    while (ptr) {
-        *ptr = _DELIMITER;
-        ptr = strchr(ptr, '\\');
-    }
+    while (char* sep = strchr(temp, '\\')) *sep = '/';
 #endif
     if (temp[0] && temp[xr_strlen(temp) - 1] != _DELIMITER)
         xr_strcat(temp, DELIMITER);

diff --git a/src/xrEngine/GameFont.cpp b/src/xrEngine/GameFont.cpp
@@ -60,12 +60,7 @@ void CGameFont::Initialize(pcstr cShader, pcstr cTextureName)
         xr_strcpy(cTexture, sizeof(cTexture), cTextureName);
 
 #if defined(LINUX)
-        char* ptr = strchr(cTexture, '\\');
-        while (ptr)
-        {
-            *ptr = '/';
-            ptr = strchr(ptr, '\\');
-        }
+    while (char* sep = strchr(cTexture, '\\')) *sep = '/';
 #endif
 
     uFlags &= ~fsValid;