From 4e07eaedbd26ca8c7636c9d546a89b2508849c33 Mon Sep 17 00:00:00 2001 From: rfm Date: Sun, 7 Jan 2007 13:32:12 +0000 Subject: [PATCH] net service locking and various documentation fixes. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24322 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 8 +++++++ Source/DocMakefile | 2 ++ Source/NSNetServices.m | 49 ++++++++++++++++++++++-------------------- Source/NSXMLParser.m | 28 ++++++++++++------------ 4 files changed, 50 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b8c0bf70..15627377e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-01-07 Richard Frith-Macdonald + + * Source/NSNetServices.m: Locking fix pointed out by Chris. + Fixes for documentation generation. + * Source/DocMakefile: Generate documentation for new classes. + * Source/NSXMLParser.m: Fix erroneous semicolons and other + autogsdoc warnings. + 2007-01-04 Richard Frith-Macdonald * Source/NSBundle.m: (initialize) tiny cleanup to avoid compiler diff --git a/Source/DocMakefile b/Source/DocMakefile index 349582f37..897e34bb7 100644 --- a/Source/DocMakefile +++ b/Source/DocMakefile @@ -75,6 +75,7 @@ NSKeyValueObserving.h \ NSLock.h \ NSMapTable.h \ NSMethodSignature.h \ +NSNetServices.h \ NSNotification.h \ NSNotificationQueue.h \ NSNull.h \ @@ -117,6 +118,7 @@ NSURLRequest.h \ NSURLResponse.h \ NSUserDefaults.h \ NSValue.h \ +NSValueTransformer.h \ NSXMLParser.h \ NSZone.h diff --git a/Source/NSNetServices.m b/Source/NSNetServices.m index f94fea73b..078f028ab 100644 --- a/Source/NSNetServices.m +++ b/Source/NSNetServices.m @@ -30,7 +30,9 @@ #import "Foundation/NSStream.h" #import "Foundation/NSTimer.h" #import "Foundation/NSValue.h" +#if defined(_REENTRANT) #import "GNUstepBase/GSLock.h" +#endif #import // Apple's DNS Service Discovery @@ -44,10 +46,6 @@ // Define // -#define PUBLIC /* public */ -#define PRIVATE static -#define EXTERN extern - #if ! defined(INET6_ADDRSTRLEN) # define INET6_ADDRSTRLEN 46 #endif @@ -78,8 +76,8 @@ } while(0); #if defined(_REENTRANT) -# define THE_LOCK GSLazyLock *lock -# define CREATELOCK(x) x->lock = [GSLazyLock new] +# define THE_LOCK GSLazyRecursiveLock *lock +# define CREATELOCK(x) x->lock = [GSLazyRecursiveLock new] # define LOCK(x) [x->lock lock] # define UNLOCK(x) [x->lock unlock] # define DESTROYLOCK(x) DESTROY(x->lock) @@ -194,21 +192,20 @@ NSString * const NSNetServicesErrorDomain = @"NSNetServicesErrorDomain"; // Prototype // -PRIVATE NSDictionary - *CreateError(id sender, - int errorCode); +static NSDictionary *CreateError(id sender, int errorCode); -PRIVATE int - ConvertError(int errorCode); +static int ConvertError(int errorCode); -PRIVATE void DNSSD_API +static void DNSSD_API // used by NSNetServiceBrowser EnumerationCallback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, DNSServiceErrorType errorCode, const char *replyDomain, - void *context), + void *context); + +static void DNSSD_API BrowserCallback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, @@ -216,7 +213,9 @@ PRIVATE void DNSSD_API const char *replyName, const char *replyType, const char *replyDomain, - void *context), + void *context); + +static void DNSSD_API // used by NSNetService ResolverCallback(DNSServiceRef sdRef, DNSServiceFlags flags, @@ -227,14 +226,18 @@ PRIVATE void DNSSD_API uint16_t port, uint16_t txtLen, const char *txtRecord, - void *context), + void *context); + +static void DNSSD_API RegistrationCallback(DNSServiceRef sdRef, DNSServiceFlags flags, DNSServiceErrorType errorCode, const char *name, const char *regtype, const char *domain, - void *context), + void *context); + +static void DNSSD_API // used by NSNetService and NSNetServiceMonitor QueryCallback(DNSServiceRef sdRef, DNSServiceFlags flags, @@ -3095,7 +3098,7 @@ PRIVATE void DNSSD_API * */ -PRIVATE NSDictionary * +static NSDictionary * CreateError(id sender, int errorCode) { NSMutableDictionary *dictionary = nil; @@ -3122,7 +3125,7 @@ CreateError(id sender, int errorCode) * */ -PRIVATE int +static int ConvertError(int errorCode) { INTERNALTRACE; @@ -3188,7 +3191,7 @@ ConvertError(int errorCode) * */ -PRIVATE void +static void EnumerationCallback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, @@ -3210,7 +3213,7 @@ EnumerationCallback(DNSServiceRef sdRef, * */ -PRIVATE void +static void BrowserCallback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, @@ -3236,7 +3239,7 @@ BrowserCallback(DNSServiceRef sdRef, * */ -PRIVATE void +static void ResolverCallback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, @@ -3266,7 +3269,7 @@ ResolverCallback(DNSServiceRef sdRef, * */ -PRIVATE void +static void RegistrationCallback(DNSServiceRef sdRef, DNSServiceFlags flags, DNSServiceErrorType errorCode, @@ -3290,7 +3293,7 @@ RegistrationCallback(DNSServiceRef sdRef, * */ -PRIVATE void +static void QueryCallback(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t interfaceIndex, diff --git a/Source/NSXMLParser.m b/Source/NSXMLParser.m index 74557ed04..ec8309d19 100644 --- a/Source/NSXMLParser.m +++ b/Source/NSXMLParser.m @@ -500,7 +500,7 @@ typedef struct NSXMLParserIvarsType return this->column; } -- (void) dealloc; +- (void) dealloc { if (this != 0) { @@ -517,9 +517,9 @@ typedef struct NSXMLParserIvarsType return _del; } -- (id) initWithContentsOfURL: (NSURL *)url +- (id) initWithContentsOfURL: (NSURL *)anURL { - return [self initWithData: [NSData dataWithContentsOfURL: url]]; + return [self initWithData: [NSData dataWithContentsOfURL: anURL]]; } - (id) initWithData: (NSData *)data @@ -549,9 +549,9 @@ typedef struct NSXMLParserIvarsType return this->line; } -- (void) setDelegate: (id)del +- (void) setDelegate: (id)delegate { - _handler = del; + _handler = delegate; } - (NSError *) parserError @@ -674,7 +674,7 @@ NSLog(@"_processTag <%@%@ %@>", flag?@"/": @"", tag, attributes); } } -- (NSString *) _entity; +- (NSString *) _entity { // parse &xxx; sequence int c; @@ -723,7 +723,7 @@ NSLog(@"_processTag <%@%@ %@>", flag?@"/": @"", tag, attributes); return entity; } -- (NSString *) _qarg; +- (NSString *) _qarg { // get argument (might be quoted) const unsigned char *ap = --this->cp; // argument start pointer @@ -760,7 +760,7 @@ NSLog(@"_processTag <%@%@ %@>", flag?@"/": @"", tag, attributes); return UTF8STR(ap, this->cp - ap); } -- (BOOL) parse; +- (BOOL) parse { // read XML (or HTML) file const unsigned char *vp = this->cp; // value pointer @@ -957,19 +957,19 @@ NSLog(@"_processTag <%@%@ %@>", flag?@"/": @"", tag, attributes); return this->shouldResolveExternalEntities; } -- (void) setShouldProcessNamespaces: (BOOL)flag +- (void) setShouldProcessNamespaces: (BOOL)aFlag { - this->shouldProcessNamespaces = flag; + this->shouldProcessNamespaces = aFlag; } -- (void) setShouldReportNamespacePrefixes: (BOOL)flag +- (void) setShouldReportNamespacePrefixes: (BOOL)aFlag { - this->shouldReportNamespacePrefixes = flag; + this->shouldReportNamespacePrefixes = aFlag; } -- (void) setShouldResolveExternalEntities: (BOOL)flag +- (void) setShouldResolveExternalEntities: (BOOL)aFlag { - this->shouldProcessNamespaces = flag; + this->shouldProcessNamespaces = aFlag; } - (void) _setAcceptHTML: (BOOL) flag