From: John Hodge (sonata) <tpg@mutabah.net>
Date: Sat, 15 Mar 2014 09:18:26 +0000 (+0800)
Subject: Merge branch 'master' of git://ted.mutabah.net/acess2
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=7b64f5e7f00e445a5637e9e3289a1332a14d28e5;hp=-c;p=tpg%2Facess2.git

Merge branch 'master' of git://ted.mutabah.net/acess2
---

7b64f5e7f00e445a5637e9e3289a1332a14d28e5
diff --combined Usermode/Libraries/libpsocket.so_src/getaddrinfo.c
index cb361f9c,57108e94..5c21c06e
--- a/Usermode/Libraries/libpsocket.so_src/getaddrinfo.c
+++ b/Usermode/Libraries/libpsocket.so_src/getaddrinfo.c
@@@ -86,6 -86,8 +86,8 @@@ int getaddrinfo(const char *node, cons
  			// TODO: DNS Lookups
  			// ? /Acess/Conf/Nameservers
  			// ? /Acess/Conf/Hosts
+ 			//count = Net_LookupDNS(node, service, NULL);
+ 			//
  		}
  		
  		// 3. No Match, chuck sad
@@@ -113,9 -115,9 +115,9 @@@
  	// Convert `node` into types
  	if( service )
  	{
 -		char *end;
 +		const char *end;
  		
 -		default_port = strtol(service, &end, 0);
 +		default_port = strtol(service, (char**)&end, 0);
  		if( *end != '\0' && (hints->ai_flags & AI_NUMERICSERV) )
  		{
  			return EAI_NONAME;
@@@ -142,8 -144,7 +144,7 @@@
  		}
  	}
  
- 	struct addrinfo	*ai;
- 	for( ai = ret; ai; ai = ai->ai_next)
+ 	for( struct addrinfo *ai = ret; ai; ai = ai->ai_next)
  	{
  		struct sockaddr_in	*in = (void*)ai->ai_addr;
  		struct sockaddr_in6	*in6 = (void*)ai->ai_addr;