--- a/Socket.st Tue May 21 22:22:21 2013 +0200
+++ b/Socket.st Tue May 21 22:46:35 2013 +0200
@@ -207,7 +207,7 @@
nInstVars = __intVal(__ClassInstPtr(oClass)->c_ninstvars);
nInstBytes = OHDR_SIZE + nInstVars * sizeof(OBJ);
offs = offs + nInstBytes;
- objSize = _Size(aDataBuffer) - offs;
+ objSize = __Size(aDataBuffer) - offs;
}
*p_extPtr = extPtr;
*p_objSize = objSize;
@@ -1572,22 +1572,22 @@
!
sendData: aStringOrByteArray
- "Send all of the data in the given array, even if it requires multiple calls to send it all.
- Return the number of bytes sent."
-
- "An experimental version for use on slow lines:
- Longer timeout and smaller writes to try to avoid spurious timeouts."
-
- |remaining nWritten|
+ "Send all of the data in the given array, even if it requires multiple calls to send it all.
+ Return the number of bytes sent."
+
+ "An experimental version for use on slow lines:
+ Longer timeout and smaller writes to try to avoid spurious timeouts."
+
+ |remaining nWritten|
"/ Transcript show:'>> '; showCR:aStringOrByteArray.
- remaining := aStringOrByteArray size.
- [remaining > 0] whileTrue:[
- nWritten := self nextPutBytes:remaining from:aStringOrByteArray startingAt:1.
- remaining := remaining - nWritten.
- ].
- ^ aStringOrByteArray size.
+ remaining := aStringOrByteArray size.
+ [remaining > 0] whileTrue:[
+ nWritten := self nextPutBytes:remaining from:aStringOrByteArray startingAt:1.
+ remaining := remaining - nWritten.
+ ].
+ ^ aStringOrByteArray size.
"/ | bytesSent bytesToSend count |
"/ bytesToSend := aStringOrByteArray size.
@@ -2084,7 +2084,7 @@
DBGFPRINTF((stderr, "SOCKET: connect...\n"));
__threadErrno = 0;
ret = (INT)STX_WSA_NOINT_CALL3("connect", connect, sock, &sa, (INT)sockaddr_size);
- DBGFPRINTF((stderr, "SOCKET: connect(%d) -> %d (%d)\n", sock, ret, __threadErrno));
+ DBGFPRINTF((stderr, "SOCKET: connect(%d) -> %"_ld_" (%d)\n", sock, (INT)ret, __threadErrno));
} while ((ret < 0) && (__threadErrno == EINTR));
/* __setWrapCallDebugging(1,0); */
# else
@@ -2119,8 +2119,8 @@
} else
# endif /* EINPROGRESS or EALREADY */
{
- DBGFPRINTF((stderr, "SOCKET: connect failed ret=%d errno=%d __threadErrno=%d\n",
- ret, errno, __threadErrno ));
+ DBGFPRINTF((stderr, "SOCKET: connect failed ret=%"_ld_" errno=%d __threadErrno=%d\n",
+ (INT)ret, errno, __threadErrno ));
# ifdef DUMP_ADDRESS
{
char *cp = (char *)(&sa);
@@ -4056,10 +4056,10 @@
!Socket class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.280 2013-03-26 12:37:38 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.281 2013-05-21 20:46:35 cg Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.280 2013-03-26 12:37:38 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.281 2013-05-21 20:46:35 cg Exp $'
! !