moved str_skip_to_whitespace function

3 files changed, 27 insertions, 10 deletions

diff --git a/src/base/system.c b/src/base/system.c
index 6a70452f..812977c3 100644
--- a/src/base/system.c
+++ b/src/base/system.c
@@ -1146,6 +1146,13 @@ void str_sanitize(char *str_in)
 	}
 }
 
+char *str_skip_to_whitespace(char *str)
+{
+	while(*str && (*str != ' ' && *str != '\t' && *str != '\n'))
+		str++;
+	return str;
+}
+
 char *str_skip_whitespaces(char *str)
 {
 	while(*str && (*str == ' ' || *str == '\t' || *str == '\n' || *str == '\r'))
diff --git a/src/base/system.h b/src/base/system.h
index 3d0d5cc7..e5ce1484 100644
--- a/src/base/system.h
+++ b/src/base/system.h
@@ -757,6 +757,22 @@ void str_sanitize_cc(char *str);
 void str_sanitize(char *str);
 
 /*
+	Function: str_skip_to_whitespace
+		Skips leading non-whitespace characters(all but ' ', '\t', '\n', '\r').
+	
+	Parameters:
+		str - Pointer to the string.
+
+	Returns:
+		Pointer to the first whitespace character found
+		within the string.
+
+	Remarks:
+		- The strings are treated as zero-termineted strings.
+*/
+char *str_skip_to_whitespace(char *str);
+
+/*
 	Function: str_skip_whitespaces
 		Skips leading whitespace characters(' ', '\t', '\n', '\r').
 	
diff --git a/src/engine/shared/console.cpp b/src/engine/shared/console.cpp
index 87554678..deda8be5 100644
--- a/src/engine/shared/console.cpp
+++ b/src/engine/shared/console.cpp
@@ -29,12 +29,6 @@ float CConsole::CResult::GetFloat(unsigned Index)
 }
 
 // the maximum number of tokens occurs in a string of length CONSOLE_MAX_STR_LENGTH with tokens size 1 separated by single spaces
-static char *SkipToBlank(char *pStr)
-{
-	while(*pStr && (*pStr != ' ' && *pStr != '\t' && *pStr != '\n'))
-		pStr++;
-	return pStr;
-}
 
 
 int CConsole::ParseStart(CResult *pResult, const char *pString, int Length)
@@ -50,7 +44,7 @@ int CConsole::ParseStart(CResult *pResult, const char *pString, int Length)
 	// get command
 	pStr = str_skip_whitespaces(pStr);
 	pResult->m_pCommand = pStr;
-	pStr = SkipToBlank(pStr);
+	pStr = str_skip_to_whitespace(pStr);
 	
 	if(*pStr)
 	{
@@ -133,11 +127,11 @@ int CConsole::ParseArgs(CResult *pResult, const char *pFormat)
 				if(Command == 'r') // rest of the string
 					break;
 				else if(Command == 'i') // validate int
-					pStr = SkipToBlank(pStr);
+					pStr = str_skip_to_whitespace(pStr);
 				else if(Command == 'f') // validate float
-					pStr = SkipToBlank(pStr);
+					pStr = str_skip_to_whitespace(pStr);
 				else if(Command == 's') // validate string
-					pStr = SkipToBlank(pStr);
+					pStr = str_skip_to_whitespace(pStr);
 
 				if(pStr[0] != 0) // check for end of string
 				{