R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

utility.cpp light cleanup

Browse Source 
* Use ternary operator for simple tests.
* Default 'GetFileName's 'bRemoveExtension' parameter to false.
This commit is contained in:
Kawe Mazidjatari 2022-11-23 16:54:10 +01:00
parent 2e9aa9a77c
commit 824a9f8bb2
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
r5dev/public/utility/utility.cpp
View File

@ -274,6 +274,7 @@ bool HasExtension(const string& svInput, const string& svExtension)
string GetExtension(const string& svInput, bool bReturnOriginal, bool bKeepDelimiter)
{
string::size_type nPos = svInput.rfind('.');
if (nPos != string::npos)
{
if (!bKeepDelimiter)
@ -294,6 +295,7 @@ string GetExtension(const string& svInput, bool bReturnOriginal, bool bKeepDelim
string RemoveExtension(const string& svInput)
{
string::size_type nPos = svInput.find_last_of('.');
if (nPos == string::npos)
{
return svInput;
@ -316,15 +318,8 @@ bool HasFileName(const string& svInput, const string& svFileName)
// For removing the path from file names.
string GetFileName(const string& svInput, bool bRemoveExtension, bool bWindows)
{
string::size_type nPos;
if (bWindows)
{
nPos = svInput.rfind('\\');
}
else
{
nPos = svInput.rfind('/');
}
string::size_type nPos = bWindows ? svInput.rfind('\\') : svInput.rfind('/');
if (nPos != string::npos)
{
if (bRemoveExtension)
@ -347,15 +342,8 @@ string GetFileName(const string& svInput, bool bRemoveExtension, bool bWindows)
// For removing file names from the path.
string RemoveFileName(const string& svInput, bool bWindows)
{
string::size_type nPos;
if (bWindows)
{
nPos = svInput.find_last_of('\\');
}
else
{
nPos = svInput.find_last_of('/');
}
string::size_type nPos = bWindows ? svInput.find_last_of('\\') : svInput.find_last_of('/');
if (nPos == string::npos)
{
return "";

2
r5dev/public/utility/utility.h
View File

@ -26,7 +26,7 @@ string GetExtension(const string& svInput, bool bReturnOriginal = false, bool bK
string RemoveExtension(const string& svInput);
bool HasFileName(const string& svInput, const string& svFileName);
string GetFileName(const string& svInput, bool bRemoveExtension, bool bWindows = false);
string GetFileName(const string& svInput, bool bRemoveExtension = false, bool bWindows = false);
string RemoveFileName(const string& svInput, bool bWindows = false);
string CreateDirectories(string svInput, bool bWindows = false);