Important change to the START_SET and END_SET macros to stop their use

being confusing.  They now both take a simple C-string argument which
names the set, and the macros check that each end matches a start of
the same name.  Since tis means that a START_SET no longer takes an
argument sayng whether or notthe set is to be skipped, we now have a
SKIP macro to be used inside a set to skip to the end of it.  This
is actually more versatile as we can have multiple SKIP macros in the
same set, each providing a different reason for the set being skipped.
Also removed a few obsolete/unused functions and macros.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32355 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2011-02-24 16:26:01 +00:00
parent 7027375a67
commit e6dc5a58b6
37 changed files with 214 additions and 195 deletions

View file

@ -140,36 +140,38 @@ int main()
[defaultOutput setDelegate: nil];
#endif
START_SET(SSL_SUPPORTED)
done = NO;
byteCount = 0;
defaultInput = nil;
defaultOutput = nil;
li = [[Listener new] autorelease];
[NSStream getStreamsToHost: host port: 443
inputStream: &defaultInput outputStream: &defaultOutput];
START_SET("NSStream SSL")
if (!SSL_SUPPORTED)
SKIP("NSStream SSL functions not supported\nThe GNU TLS library was not provided when GNUstep-base was configured/built.")
done = NO;
byteCount = 0;
defaultInput = nil;
defaultOutput = nil;
li = [[Listener new] autorelease];
[NSStream getStreamsToHost: host port: 443
inputStream: &defaultInput outputStream: &defaultOutput];
[defaultInput setDelegate: li];
[defaultOutput setDelegate: li];
[defaultInput scheduleInRunLoop: rl forMode: NSDefaultRunLoopMode];
[defaultOutput scheduleInRunLoop: rl forMode: NSDefaultRunLoopMode];
[defaultInput setProperty: NSStreamSocketSecurityLevelNegotiatedSSL
forKey: NSStreamSocketSecurityLevelKey];
[defaultOutput setProperty: NSStreamSocketSecurityLevelNegotiatedSSL
forKey: NSStreamSocketSecurityLevelKey];
[defaultInput open];
[defaultOutput open];
[defaultInput setDelegate: li];
[defaultOutput setDelegate: li];
[defaultInput scheduleInRunLoop: rl forMode: NSDefaultRunLoopMode];
[defaultOutput scheduleInRunLoop: rl forMode: NSDefaultRunLoopMode];
[defaultInput setProperty: NSStreamSocketSecurityLevelNegotiatedSSL
forKey: NSStreamSocketSecurityLevelKey];
[defaultOutput setProperty: NSStreamSocketSecurityLevelNegotiatedSSL
forKey: NSStreamSocketSecurityLevelKey];
[defaultInput open];
[defaultOutput open];
d = [NSDate dateWithTimeIntervalSinceNow: 30];
while (done == NO && [d timeIntervalSinceNow] > 0.0)
{
[rl runMode: NSDefaultRunLoopMode beforeDate: d];
}
d = [NSDate dateWithTimeIntervalSinceNow: 30];
while (done == NO && [d timeIntervalSinceNow] > 0.0)
{
[rl runMode: NSDefaultRunLoopMode beforeDate: d];
}
PASS(byteCount>0, "read www.google.com https");
[defaultInput setDelegate: nil];
[defaultOutput setDelegate: nil];
END_SET("NSStream SSL functions not supported\nThe GNU TLS library was not provided when GNUstep-base was configured/built.")
PASS(byteCount>0, "read www.google.com https");
[defaultInput setDelegate: nil];
[defaultOutput setDelegate: nil];
END_SET("NSStream SSL")
[arp release];
return 0;