Author: mturk
Date: Fri Jul 15 06:22:47 2011
New Revision: 1146971
URL: http://svn.apache.org/viewvc?rev=1146971&view=rev
Log:
Use better member name
Modified:
commons/sandbox/runtime/trunk/src/main/native/include/acr/descriptor.h
commons/sandbox/runtime/trunk/src/main/native/os/win32/localsock.c
Modified: commons/sandbox/runtime/trunk/src/main/native/include/acr/descriptor.h
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/include/acr/descriptor.h?rev=1146971&r1=1146970&r2=1146971&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/include/acr/descriptor.h
(original)
+++ commons/sandbox/runtime/trunk/src/main/native/include/acr/descriptor.h Fri
Jul 15 06:22:47 2011
@@ -64,7 +64,7 @@ struct acr_sd_t {
int s;
#endif
#if defined(WINDOWS)
- WCHAR *localsock;
+ WCHAR *socketfname;
LPOVERLAPPED pob; /**< For TransmitFile */
#else
off_t off;
Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/localsock.c
URL:
http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/localsock.c?rev=1146971&r1=1146970&r2=1146971&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/localsock.c
(original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/localsock.c Fri Jul
15 06:22:47 2011
@@ -76,10 +76,10 @@ ACR_NET_EXPORT(jint, LocalDescriptor, cl
}
if (sd != INVALID_SOCKET) {
fd->s = INVALID_SOCKET;
- if (fd->localsock) {
- DeleteFileW(fd->localsock);
- AcrFree(fd->localsock);
- fd->localsock = 0;
+ if (fd->socketfname) {
+ DeleteFileW(fd->socketfname);
+ AcrFree(fd->socketfname);
+ fd->socketfname = 0;
}
if (closesocket(sd) == SOCKET_ERROR)
rc = ACR_GET_NETOS_ERROR();
@@ -382,7 +382,7 @@ ACR_NET_EXPORT(jint, LocalServerEndpoint
goto failed;
}
SOCKADDR_RELEASE(ba, aa);
- fd->localsock = wcsdup(sname);
+ fd->socketfname = wcsdup(sname);
return 0;
failed:
