remove ParseOptionalIPAddress

  I had just added it in the last commit but it made its use case
non-obvious. Checking whether the string is empty before trying to
parse an IP address is clearer than calling some function that has
its own concept of what an empty address is.

3 files changed, 3 insertions, 12 deletions

diff --git a/src/connections.cc b/src/connections.cc
index d032ce5..480cc1e 100644
--- a/src/connections.cc
+++ b/src/connections.cc
@@ -918,7 +918,7 @@ void ProcessSetNamelockQuery(TConnection *Connection, TReadBuffer *Buffer){
 	Buffer->ReadString(Comment, sizeof(Comment));
 
 	int IPAddress = 0;
-	if(!ParseOptionalIPAddress(IPString, &IPAddress)){
+	if(!StringEmpty(IPString) && !ParseIPAddress(IPString, &IPAddress)){
 		SendQueryStatusFailed(Connection);
 		return;
 	}
@@ -978,7 +978,7 @@ void ProcessBanishAccountQuery(TConnection *Connection, TReadBuffer *Buffer){
 	bool FinalWarning = Buffer->ReadFlag();
 
 	int IPAddress = 0;
-	if(!ParseOptionalIPAddress(IPString, &IPAddress)){
+	if(!StringEmpty(IPString) && !ParseIPAddress(IPString, &IPAddress)){
 		SendQueryStatusFailed(Connection);
 		return;
 	}
@@ -1045,7 +1045,7 @@ void ProcessSetNotationQuery(TConnection *Connection, TReadBuffer *Buffer){
 	Buffer->ReadString(Comment, sizeof(Comment));
 
 	int IPAddress = 0;
-	if(!ParseOptionalIPAddress(IPString, &IPAddress)){
+	if(!StringEmpty(IPString) && !ParseIPAddress(IPString, &IPAddress)){
 		SendQueryStatusFailed(Connection);
 		return;
 	}
diff --git a/src/querymanager.cc b/src/querymanager.cc
index 01db930..78a9eda 100644
--- a/src/querymanager.cc
+++ b/src/querymanager.cc
@@ -201,14 +201,6 @@ bool ParseIPAddress(const char *String, int *OutAddr){
 	return true;
 }
 
-bool ParseOptionalIPAddress(const char *String, int *OutAddr){
-	if(String == NULL || StringEmpty(String)){
-		return true;
-	}
-
-	return ParseIPAddress(String, OutAddr);
-}
-
 bool ReadBooleanConfig(bool *Dest, const char *Val){
 	ASSERT(Dest && Val);
 	*Dest = StringEqCI(Val, "true");
diff --git a/src/querymanager.hh b/src/querymanager.hh
index 0137f64..c1e48eb 100644
--- a/src/querymanager.hh
+++ b/src/querymanager.hh
@@ -110,7 +110,6 @@ bool StringEqCI(const char *A, const char *B);
 bool StringCopyN(char *Dest, int DestCapacity, const char *Src, int SrcLength);
 bool StringCopy(char *Dest, int DestCapacity, const char *Src);
 bool ParseIPAddress(const char *String, int *OutAddr);
-bool ParseOptionalIPAddress(const char *String, int *OutAddr);
 
 bool ReadBooleanConfig(bool *Dest, const char *Val);
 bool ReadIntegerConfig(int *Dest, const char *Val);