--- a/Socket.st Tue Mar 26 20:22:38 2002 +0100
+++ b/Socket.st Tue Apr 09 16:58:01 2002 +0200
@@ -3427,7 +3427,7 @@
DBGFPRINTF((stderr, "socket fclose %x (%d)\n", fp, fileno(fp)));
fflush(fp);
/* shutdown(fileno(fp), 2); */
- if (@global(ExternalStream:FileOpenTrace) == true) {
+ if (@global(FileOpenTrace) == true) {
fprintf(stderr, "fclose [Socket] %x\n", fp);
}
fclose(fp);
@@ -3528,7 +3528,7 @@
__BEGIN_INTERRUPTABLE__
shutdown(fd, 2);
DBGFPRINTF((stderr, "socket fclose %x (%d)\n", fp, fd));
- if (@global(ExternalStream:FileOpenTrace) == true) {
+ if (@global(FileOpenTrace) == true) {
fprintf(stderr, "fclose [Socket] %x\n", f);
}
fclose(f);
@@ -3868,7 +3868,7 @@
DBGFPRINTF((stderr, "socket close (fdopen failed) (%d)\n", newSock));
RETURN (false);
}
- if (@global(ExternalStream:FileOpenTrace) == true) {
+ if (@global(FileOpenTrace) == true) {
fprintf(stderr, "fdopen [Socket] -> %x\n", fp);
}
@@ -3900,7 +3900,7 @@
"/ first, a quick check if data is already available
- |connection wasBlocked sema|
+ |wasBlocked sema|
self canReadWithoutBlocking ifTrue:[
^ self accept.
@@ -3968,8 +3968,6 @@
This method implements the inner wait-primitive of a single-connection
server application."
- |newConnection|
-
(self readWaitWithTimeout:timeoutSeconds) ifTrue:[
"/ a timeout occurred - no connection within timeout
^ nil
@@ -4746,7 +4744,7 @@
DBGFPRINTF((stderr, "socket close (fdopen failed) (%d)\n", sock));
__END_INTERRUPTABLE__
} else {
- if (@global(ExternalStream:FileOpenTrace) == true) {
+ if (@global(FileOpenTrace) == true) {
fprintf(stderr, "fdopen [Socket] -> %x\n", fp);
}
@@ -4884,7 +4882,7 @@
DBGFPRINTF((stderr, "socket close (fdopen failed) (%d)\n", sock));
__END_INTERRUPTABLE__
} else {
- if (@global(ExternalStream:FileOpenTrace) == true) {
+ if (@global(FileOpenTrace) == true) {
fprintf(stderr, "fdopen [Socket] -> %x\n", fp);
}
@@ -5116,5 +5114,5 @@
!Socket class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.161 2002-03-20 09:21:11 penk Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic2/Socket.st,v 1.162 2002-04-09 14:58:01 stefan Exp $'
! !