From ce25b2ce89ac28932045690792da9c1ca9544f60 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Sat, 19 Jun 2010 17:04:04 +0000 Subject: [PATCH] * net_udp.c: more minor fixes and tidy-ups. git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@190 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/net_udp.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Quake/net_udp.c b/Quake/net_udp.c index 2cb93834..f313b5b2 100644 --- a/Quake/net_udp.c +++ b/Quake/net_udp.c @@ -65,7 +65,7 @@ int UDP_Init (void) { Con_Printf ("UDP init failed. Disabling UDP...\n"); return -1; - } + } local = gethostbyname(buff); if (local == NULL) @@ -260,7 +260,7 @@ int UDP_CheckNewConnections (void) //============================================================================= -void get_qsockaddr(struct sockaddr *saddr, struct qsockaddr *qaddr) +static void get_qsockaddr(struct sockaddr *saddr, struct qsockaddr *qaddr) { qaddr->sa_family = saddr->sa_family; memcpy(&(qaddr->sa_data), &(saddr->sa_data), sizeof(qaddr->sa_data)); @@ -269,11 +269,10 @@ void get_qsockaddr(struct sockaddr *saddr, struct qsockaddr *qaddr) int UDP_Read (int socket, byte *buf, int len, struct qsockaddr *addr) { static struct sockaddr saddr; - unsigned int addrlen = sizeof (struct sockaddr); - int ret; + socklen_t addrlen = sizeof (struct sockaddr); + int ret; ret = recvfrom (socket, buf, len, 0, &saddr, &addrlen); - if (ret == -1 && (errno == EWOULDBLOCK || errno == ECONNREFUSED)) return 0; @@ -323,7 +322,6 @@ int UDP_Write (int socket, byte *buf, int len, struct qsockaddr *addr) int ret; ret = sendto (socket, buf, len, 0, (struct sockaddr *)addr, sizeof(struct qsockaddr)); - if (ret == -1 && errno == EWOULDBLOCK) return 0; return ret; @@ -363,11 +361,10 @@ int UDP_StringToAddr (char *string, struct qsockaddr *addr) int UDP_GetSocketAddr (int socket, struct qsockaddr *addr) { - unsigned int addrlen = sizeof(struct qsockaddr); + socklen_t addrlen = sizeof(struct qsockaddr); unsigned int a; Q_memset(addr, 0, sizeof(struct qsockaddr)); - if (getsockname(socket, (struct sockaddr *)addr, &addrlen) != 0) return -1;