ports/archivers/urbackup-client/files/patch-client_stringtools.cpp

Build fails on FreeBSD due to urbackup's local definitions of isnumber()
conflicting with a library function. This patch renames the port's definition to
resolve the conflict. Analogous changes are also made in client/stringtools.h

--- client/stringtools.cpp.orig	2018-08-12 19:17:45 UTC
+++ client/stringtools.cpp
@@ -486,12 +486,12 @@ std::string nconvert(s32 i){
 	ss << i;
 	return ss.str();
 }
-
-std::string nconvert(int long i) {
-	ostringstream ss;
-	ss << i;
-	return ss.str();
-}
+
+std::string nconvert(int long i) {
+	ostringstream ss;
+	ss << i;
+	return ss.str();
+}
 
 #if defined(_WIN64) || defined(_LP64)
 std::string nconvert(unsigned int i){
@@ -825,7 +825,7 @@ void TokenizeMail(std::string& str, std:
 //--------------------------------------------------------------------
 /**
 */
-bool isnumber(char ch)
+bool isnumber_local(char ch)
 {
 	if( ch>=48 && ch <=57 )
 		return true;
@@ -848,7 +848,7 @@ bool isletter(char ch)
 //--------------------------------------------------------------------
 /**
 */
-bool isnumber(wchar_t ch)
+bool isnumber_local(wchar_t ch)
 {
 	if( ch>=48 && ch <=57 )
 		return true;
@@ -928,7 +928,7 @@ int getNextNumber(const std::string &pSt
 	bool start=false;
 	for(size_t i=0;i<pStr.size();++i)
 	{
-		if( isnumber(pStr[i] ) )
+		if( isnumber_local(pStr[i] ) )
 		{
 			num+=pStr[i];
 			start=true;
@@ -1445,7 +1445,7 @@ void replaceNonAlphaNumeric(std::string 
 {
 	for(size_t i=0;i<str.size();++i)
 	{
-		if(isletter(str[i])==false && isnumber(str[i])==false)
+		if(isletter(str[i])==false && isnumber_local(str[i])==false)
 		{
 			str[i]=rch;
 		}
@@ -1497,4 +1497,4 @@ std::string EscapeParamString(const std:
 		}
 	}
 	return ret;
-}
\ No newline at end of file
+}