phosit/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

add code to output both affected paths in case separators are being mixed

Browse Source 
This was SVN commit r9516.
This commit is contained in:
janwas 2011-05-14 20:25:32 +00:00
parent 2dff290c28
commit 45d358dd9a
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/lib/path.h
View File

@ -194,7 +194,11 @@ public:
ret.path += ret.separator;
if(rhs.path.find((ret.separator == '/')? '\\' : '/') != String::npos)
{
PrintToDebugOutput();
rhs.PrintToDebugOutput();
DEBUG_WARN_ERR(ERR::PATH_MIXED_SEPARATORS);
}
ret.path += rhs.path;
return ret;
}
@ -202,12 +206,20 @@ public:
static Status Validate(String::value_type c);
private:
void PrintToDebugOutput() const
{
debug_printf(L"Path %ws, separator %c\n", path.c_str(), separator);
}
void DetectSeparator()
{
const size_t idxBackslash = path.find('\\');
if(path.find('/') != String::npos && idxBackslash != String::npos)
{
PrintToDebugOutput();
DEBUG_WARN_ERR(ERR::PATH_MIXED_SEPARATORS);
}
// (default to '/' for empty strings)
separator = (idxBackslash == String::npos)? '/' : '\\';