From 8fb233e3dc2112891146ffef1a6d6244b19e0ceb Mon Sep 17 00:00:00 2001 From: rfm Date: Thu, 10 Aug 2006 06:23:08 +0000 Subject: [PATCH] don't say we have data/bytes available if an error occurred. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@23241 72102866-910b-0410-8b05-ffd578937521 --- Source/win32/NSStreamWin32.m | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/win32/NSStreamWin32.m b/Source/win32/NSStreamWin32.m index 404e32bca..36ff24bf3 100644 --- a/Source/win32/NSStreamWin32.m +++ b/Source/win32/NSStreamWin32.m @@ -405,7 +405,7 @@ static void setNonblocking(SOCKET fd) - (BOOL) hasBytesAvailable { - if ([self _isOpened] && [self streamStatus] != NSStreamStatusAtEnd) + if ([self streamStatus] == NSStreamStatusOpen) return YES; return NO; } @@ -768,7 +768,7 @@ static void setNonblocking(SOCKET fd) - (BOOL) hasBytesAvailable { - if ([self _isOpened] && [self streamStatus] != NSStreamStatusAtEnd) + if ([self streamStatus] == NSStreamStatusOpen) return YES; return NO; } @@ -802,7 +802,7 @@ static void setNonblocking(SOCKET fd) { error = WSAGetLastError(); } -//else NSLog(@"EVENTS 0x%x on %p", events.lNetworkEvents, self); +else NSLog(@"EVENTS 0x%x on %p", events.lNetworkEvents, self); if ([self streamStatus] == NSStreamStatusOpening) { @@ -948,7 +948,7 @@ static void setNonblocking(SOCKET fd) - (BOOL) hasSpaceAvailable { - if ([self _isOpened]) + if ([self streamStatus] == NSStreamStatusOpen) return YES; return NO; } @@ -1061,7 +1061,7 @@ static void setNonblocking(SOCKET fd) - (BOOL) hasSpaceAvailable { - if ([self _isOpened] && [self streamStatus] != NSStreamStatusWriting) + if ([self streamStatus] == NSStreamStatusOpen) return YES; return NO; } @@ -1309,7 +1309,7 @@ static void setNonblocking(SOCKET fd) - (BOOL) hasSpaceAvailable { - if ([self _isOpened]) + if ([self streamStatus] == NSStreamStatusOpen) return YES; return NO; } @@ -1419,7 +1419,7 @@ static void setNonblocking(SOCKET fd) { error = WSAGetLastError(); } -//else NSLog(@"EVENTS 0x%x on %p", events.lNetworkEvents, self); +else NSLog(@"EVENTS 0x%x on %p", events.lNetworkEvents, self); if ([self streamStatus] == NSStreamStatusOpening) {