Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-21 14:23:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switching os.h to StringView.

Browse Source
This commit is contained in:
Branimir Karadžić
2018-11-22 13:35:18 -08:00
parent e94113ff0a
commit a89331575a
3 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/filepath.cpp
View File

@@ -153,12 +153,12 @@ namespace bx
return size;
}
static bool getEnv(const char* _name, FileInfo::Enum _type, char* _out, uint32_t* _inOutSize)
static bool getEnv(char* _out, uint32_t* _inOutSize, const StringView& _name, FileInfo::Enum _type)
{
uint32_t len = *_inOutSize;
*_out = '\0';
if (getEnv(_name, _out, &len) )
if (getEnv(_out, &len, _name) )
{
FileInfo fi;
if (stat(_out, fi)
@@ -203,9 +203,9 @@ namespace bx
{
return false
#if BX_PLATFORM_WINDOWS
|| getEnv("USERPROFILE", FileInfo::Directory, _out, _inOutSize)
|| getEnv(_out, _inOutSize, "USERPROFILE", FileInfo::Directory)
#endif // BX_PLATFORM_WINDOWS
|| getEnv("HOME", FileInfo::Directory, _out, _inOutSize)
|| getEnv(_out, _inOutSize, "HOME", FileInfo::Directory)
;
}
@@ -217,21 +217,21 @@ namespace bx
*_inOutSize = len;
return result;
#else
static const char* s_tmp[] =
static const StringView s_tmp[] =
{
"TMPDIR",
"TMP",
"TEMP",
"TEMPDIR",
NULL
""
};
for (const char** tmp = s_tmp; *tmp != NULL; ++tmp)
for (const StringView* tmp = s_tmp; !tmp->isEmpty(); ++tmp)
{
uint32_t len = *_inOutSize;
*_out = '\0';
bool ok = getEnv(*tmp, FileInfo::Directory, _out, &len);
bool ok = getEnv(_out, &len, *tmp, FileInfo::Directory);
if (ok
&& len != 0