vol: switch to rk_closesocket

Use roken's rk_closesocket instead of #ifdef AFS_NT40_ENV
conditional tests.

Change-Id: I3602705cea61f07b0e05c633ab57125e43cde506
Reviewed-on: http://gerrit.openafs.org/4623
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/vol/daemon_com.c b/src/vol/daemon_com.c
index 4e64abce328c2c80fdbf3f48dae4115116b6a215..44d182440503996709eff74265ab655df8f55fe3 100644 (file)
--- a/src/vol/daemon_com.c
+++ b/src/vol/daemon_com.c
@@ -173,11 +173,7 @@ SYNC_connect(SYNC_client_state * state)
 int
 SYNC_disconnect(SYNC_client_state * state)
 {
-#ifdef AFS_NT40_ENV
-    closesocket(state->fd);
-#else
-    close(state->fd);
-#endif
+    rk_closesocket(state->fd);
     state->fd = OSI_NULLSOCKET;
     return 0;
 }

diff --git a/src/vol/fssync-server.c b/src/vol/fssync-server.c
index b1f29e787085775c6a518fad27f1494422b69bfb..0f3f70eb740602d2730bdee036f044b9463e21e9 100644 (file)
--- a/src/vol/fssync-server.c
+++ b/src/vol/fssync-server.c
@@ -1984,11 +1984,7 @@ FSYNC_Drop(osi_socket fd)
     }
     VOL_UNLOCK;
     RemoveHandler(fd);
-#ifdef AFS_NT40_ENV
-    closesocket(fd);
-#else
-    close(fd);
-#endif
+    rk_closesocket(fd);
     AcceptOn();
 }
 

diff --git a/src/vol/salvsync-server.c b/src/vol/salvsync-server.c
index 73d25c92bb71f0855074def48b2196d370fc6bcc..c9dea4aa82f49506ff72e85ac0c70ac769a41c83 100644 (file)
--- a/src/vol/salvsync-server.c
+++ b/src/vol/salvsync-server.c
@@ -751,11 +751,7 @@ static void
 SALVSYNC_Drop(osi_socket fd)
 {
     RemoveHandler(fd);
-#ifdef AFS_NT40_ENV
-    closesocket(fd);
-#else
-    close(fd);
-#endif
+    rk_closesocket(fd);
     AcceptOn();
 }