SF.net SVN: bzflag:[22791] trunk/bzflag

[<bul...@us...>]

Revision: 22791
          http://sourceforge.net/p/bzflag/code/22791
Author:   bullet_catcher
Date:     2013-06-02 17:45:29 +0000 (Sun, 02 Jun 2013)
Log Message:
-----------
Add "const" to the parameter of AresHandler::queryHost(), do what should be an unnecessary safety check that it isn't null, and remove the never-used call to gethostname().

Modified Paths:
--------------
    trunk/bzflag/include/AresHandler.h
    trunk/bzflag/src/net/AresHandler.cxx

Modified: trunk/bzflag/include/AresHandler.h
===================================================================
--- trunk/bzflag/include/AresHandler.h	2013-06-01 06:44:06 UTC (rev 22790)
+++ trunk/bzflag/include/AresHandler.h	2013-06-02 17:45:29 UTC (rev 22791)
@@ -43,7 +43,7 @@
 
   void		setIndex ( int i ) {index = i;}
   void		queryHostname(const struct sockaddr *clientAddr);
-  void		queryHost(char *hostName);
+  void		queryHost(const char *hostName);
   const char   *getHostname();
   ResolutionStatus getHostAddress(struct in_addr *clientAddr);
   void		setFd(fd_set *read_set, fd_set *write_set, int &maxFile);

Modified: trunk/bzflag/src/net/AresHandler.cxx
===================================================================
--- trunk/bzflag/src/net/AresHandler.cxx	2013-06-01 06:44:06 UTC (rev 22790)
+++ trunk/bzflag/src/net/AresHandler.cxx	2013-06-02 17:45:29 UTC (rev 22791)
@@ -91,32 +91,25 @@
   logDebugMessage(2,"Player [%d] submitted reverse resolve query\n", index);
 }
 
-void AresHandler::queryHost(char *hostName)
+void AresHandler::queryHost(const char *hostName)
 {
   if (aresFailed)
     return;
   ares_cancel(aresChannel);
 
+  if (!hostName) {
+    status = Failed;
+    return;
+  }
+
   if (inet_aton(hostName, &hostAddress) != 0) {
     status = HbNSucceeded;
     return;
   }
 
-  char *queryHostName = hostName;
-
-  char myHost[MAXHOSTNAMELEN+1];
-  if (hostName == NULL || *hostName == '\0') {
-    // local address
-    if (gethostname(hostname, sizeof(hostname)) < 0) {
-      status = Failed;
-      return;
-    }
-    queryHostName = myHost;
-  }
-
   // launch the asynchronous query to look up this hostname
   status = HbNPending;
-  ares_gethostbyname(aresChannel, queryHostName, AF_INET, staticCallback,
+  ares_gethostbyname(aresChannel, hostName, AF_INET, staticCallback,
 		     (void *)this);
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.