SF.net SVN: bzflag:[20565] trunk/bzflag/src

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

Revision: 20565
          http://bzflag.svn.sourceforge.net/bzflag/?rev=20565&view=rev
Author:   bullet_catcher
Date:     2009-08-28 06:56:40 +0000 (Fri, 28 Aug 2009)

Log Message:
-----------
Change size_t to socklen_t for POSIX compliant recvfrom(), accept(), and getsockname() functions.

Modified Paths:
--------------
    trunk/bzflag/src/bzfs/bzfs.cxx
    trunk/bzflag/src/game/NetHandler.cxx

Modified: trunk/bzflag/src/bzfs/bzfs.cxx
===================================================================
--- trunk/bzflag/src/bzfs/bzfs.cxx	2009-08-28 02:39:11 UTC (rev 20564)
+++ trunk/bzflag/src/bzfs/bzfs.cxx	2009-08-28 06:56:40 UTC (rev 20565)
@@ -736,7 +736,7 @@
     }
 
     // fixup ping reply
-    size_t addrLen = sizeof(addr);
+    socklen_t addrLen = sizeof(addr);
     if (getsockname(wksSocket, (struct sockaddr*)&addr, &addrLen) >= 0)
       pingReply.serverId.port = addr.sin_port;
 
@@ -1219,7 +1219,7 @@
   // client (not a player yet) is requesting service.
   // accept incoming connection on our well known port
   struct sockaddr_in clientAddr;
-  size_t addr_len = sizeof(clientAddr);
+  socklen_t addr_len = sizeof(clientAddr);
   int fd = accept(wksSocket, (struct sockaddr*)&clientAddr, &addr_len);
   if (fd == -1) {
     nerror("accepting on wks");

Modified: trunk/bzflag/src/game/NetHandler.cxx
===================================================================
--- trunk/bzflag/src/game/NetHandler.cxx	2009-08-28 02:39:11 UTC (rev 20564)
+++ trunk/bzflag/src/game/NetHandler.cxx	2009-08-28 06:56:40 UTC (rev 20565)
@@ -137,7 +137,7 @@
 int NetHandler::udpReceive(char *buffer, struct sockaddr_in *uaddr,
 			   NetHandler **netHandler)
 {
-  size_t recvlen = sizeof(*uaddr);
+  socklen_t recvlen = sizeof(*uaddr);
   uint16_t len;
   uint16_t code;
 
@@ -895,7 +895,7 @@
 void NetListener::accept (void)
 {
   struct sockaddr_in clientAddr;
-  size_t addr_len = sizeof(clientAddr);
+  socklen_t addr_len = sizeof(clientAddr);
   int fd = (int)::accept(listenSocket, (struct sockaddr*)&clientAddr, &addr_len);
   if (fd == -1)
     {


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