[brlcad-commits] SF.net SVN: brlcad:[67062] brlcad/trunk/src/adrt/tienet.c

[<sta...@us...>]

Revision: 67062
          http://sourceforge.net/p/brlcad/code/67062
Author:   starseeker
Date:     2016-02-04 21:29:27 +0000 (Thu, 04 Feb 2016)
Log Message:
-----------
avoid collisions with globals

Modified Paths:
--------------
    brlcad/trunk/src/adrt/tienet.c

Modified: brlcad/trunk/src/adrt/tienet.c
===================================================================
--- brlcad/trunk/src/adrt/tienet.c	2016-02-04 21:23:58 UTC (rev 67061)
+++ brlcad/trunk/src/adrt/tienet.c	2016-02-04 21:29:27 UTC (rev 67062)
@@ -24,18 +24,18 @@
 #include "bio.h"
 
 int
-tienet_send(int socket, void* data, size_t size)
+tienet_send(int tsocket, void* data, size_t size)
 {
     fd_set	 set;
     unsigned int ind = 0;
     int		 r;
 
     FD_ZERO(&set);
-    FD_SET(socket, &set);
+    FD_SET(tsocket, &set);
 
     do {
-	select(socket+1, NULL, &set, NULL, NULL);
-	r = write(socket, &((char*)data)[ind], size-ind);
+	select(tsocket+1, NULL, &set, NULL, NULL);
+	r = write(tsocket, &((char*)data)[ind], size-ind);
 	ind += r;
 	if (r <= 0) return 1;	/* Error, socket is probably dead */
     } while (ind < size);
@@ -44,18 +44,18 @@
 }
 
 int
-tienet_recv(int socket, void* data, size_t size)
+tienet_recv(int tsocket, void* data, size_t size)
 {
     fd_set	 set;
     unsigned int ind = 0;
     int		 r;
 
     FD_ZERO(&set);
-    FD_SET(socket, &set);
+    FD_SET(tsocket, &set);
 
     do {
-	select(socket+1, NULL, &set, NULL, NULL);
-	r = read(socket, &((char*)data)[ind], size-ind);
+	select(tsocket+1, NULL, &set, NULL, NULL);
+	r = read(tsocket, &((char*)data)[ind], size-ind);
 	ind += r;
 	if (r <= 0) return 1;	/* Error, socket is probably dead */
     } while (ind < size);

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