gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 16:30:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tidied a little

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@25215 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2007-06-03 07:31:01 +00:00
parent f8cba86719
commit 252fb205c3
2 changed files with 44 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2007-06-03 Richard Frith-Macdonald <rfm@gnu.org>
* Source/win32/GSFileHandleWin32.m: Clean up indentation issues etc.
2007-06-01 Richard Frith-Macdonald <rfm@gnu.org> 2007-06-01 Richard Frith-Macdonald <rfm@gnu.org>
* Source/Additions/GSMime.m: Fix problem where any header starting * Source/Additions/GSMime.m: Fix problem where any header starting

91
Source/win32/GSFileHandleWin32.m
View file

@ -108,16 +108,23 @@ static NSString* NotificationKey = @"NSFileHandleNotificationKey";
} }
else else
{ {
DWORD readBytes=-1; DWORD readBytes = -1;
if (ReadFile((HANDLE)_get_osfhandle(descriptor), buf, len, &readBytes, NULL)) {
return readBytes; if (ReadFile((HANDLE)_get_osfhandle(descriptor), buf, len,
} else { &readBytes, NULL))
DWORD err = GetLastError(); {
if (err == ERROR_BROKEN_PIPE || err == ERROR_HANDLE_EOF) { return readBytes;
return readBytes; }
} else
return -1; {
} DWORD err = GetLastError();
if (err == ERROR_BROKEN_PIPE || err == ERROR_HANDLE_EOF)
{
return readBytes;
}
return -1;
}
} }
return len; return len;
} }
@ -1226,7 +1233,7 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
} }
if (readInfo) if (readInfo)
{ {
[self receivedEventRead]; [self receivedEventRead];
} }
} }
@ -1761,28 +1768,16 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
for (i = 0; i < [modes count]; i++) for (i = 0; i < [modes count]; i++)
{ {
if (event)
[l removeEvent: (void*)(uintptr_t)event [l removeEvent: (void*)(uintptr_t)event
type: ET_HANDLE type: event ? ET_HANDLE : ET_TRIGGER
forMode: [modes objectAtIndex: i]
all: YES];
else
[l removeEvent:0
type: ET_TRIGGER
forMode: [modes objectAtIndex: i] forMode: [modes objectAtIndex: i]
all: YES]; all: YES];
} }
} }
else else
{ {
if (event)
[l removeEvent: (void*)(uintptr_t)event [l removeEvent: (void*)(uintptr_t)event
type: ET_HANDLE type: event ? ET_HANDLE : ET_TRIGGER
forMode: NSDefaultRunLoopMode
all: YES];
else
[l removeEvent:0
type: ET_TRIGGER
forMode: NSDefaultRunLoopMode forMode: NSDefaultRunLoopMode
all: YES]; all: YES];
} }
@ -1845,14 +1840,8 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
for (i = 0; i < [modes count]; i++) for (i = 0; i < [modes count]; i++)
{ {
if (event)
[l addEvent: (void*)(uintptr_t)event [l addEvent: (void*)(uintptr_t)event
type: ET_HANDLE type: event ? ET_HANDLE : ET_TRIGGER
watcher: self
forMode: [modes objectAtIndex: i]];
else
[l addEvent:0
type: ET_TRIGGER
watcher: self watcher: self
forMode: [modes objectAtIndex: i]]; forMode: [modes objectAtIndex: i]];
} }
@ -1860,16 +1849,11 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
} }
else else
{ {
if (event)
[l addEvent: (void*)(uintptr_t)event [l addEvent: (void*)(uintptr_t)event
type: ET_HANDLE type: event ? ET_HANDLE : ET_TRIGGER
watcher: self watcher: self
forMode: NSDefaultRunLoopMode]; forMode: NSDefaultRunLoopMode];
else else
[l addEvent:0
type: ET_TRIGGER
watcher: self
forMode: NSDefaultRunLoopMode];
} }
} }
@ -2232,21 +2216,26 @@ NSString * const GSSOCKSRecvAddr = @"GSSOCKSRecvAddr";
{ {
unsigned long dummy; unsigned long dummy;
if (isSocket != YES) { if (isSocket != YES)
// Not a file and not a socket, must be a pipe { // Not a file and not a socket, must be a pipe
DWORD mode; DWORD mode;
if (flag)
mode = PIPE_NOWAIT; if (flag)
else mode = PIPE_NOWAIT;
mode = PIPE_WAIT; else
if (SetNamedPipeHandleState((HANDLE)_get_osfhandle(descriptor), &mode, NULL, NULL)) { mode = PIPE_WAIT;
isNonBlocking = flag; if (SetNamedPipeHandleState((HANDLE)_get_osfhandle(descriptor),
} else { &mode, NULL, NULL))
{
isNonBlocking = flag;
}
else
{
NSLog(@"unable to set pipe non-blocking mode - %d", NSLog(@"unable to set pipe non-blocking mode - %d",
GetLastError()); GetLastError());
} }
return; return;
} }
if (flag) if (flag)
{ {