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

net service locking and various documentation fixes.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24322 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2007-01-07 13:32:12 +00:00
parent 5fec05f472
commit 4e07eaedbd
4 changed files with 50 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2007-01-07 Richard Frith-Macdonald <rfm@gnu.org>
* 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 <rfm@gnu.org> 2007-01-04 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSBundle.m: (initialize) tiny cleanup to avoid compiler * Source/NSBundle.m: (initialize) tiny cleanup to avoid compiler

2
Source/DocMakefile
View file

@ -75,6 +75,7 @@ NSKeyValueObserving.h \
NSLock.h \ NSLock.h \
NSMapTable.h \ NSMapTable.h \
NSMethodSignature.h \ NSMethodSignature.h \
NSNetServices.h \
NSNotification.h \ NSNotification.h \
NSNotificationQueue.h \ NSNotificationQueue.h \
NSNull.h \ NSNull.h \
@ -117,6 +118,7 @@ NSURLRequest.h \
NSURLResponse.h \ NSURLResponse.h \
NSUserDefaults.h \ NSUserDefaults.h \
NSValue.h \ NSValue.h \
NSValueTransformer.h \
NSXMLParser.h \ NSXMLParser.h \
NSZone.h NSZone.h

49
Source/NSNetServices.m
View file

@ -30,7 +30,9 @@
#import "Foundation/NSStream.h" #import "Foundation/NSStream.h"
#import "Foundation/NSTimer.h" #import "Foundation/NSTimer.h"
#import "Foundation/NSValue.h" #import "Foundation/NSValue.h"
#if defined(_REENTRANT)
#import "GNUstepBase/GSLock.h" #import "GNUstepBase/GSLock.h"
#endif
#import <dns_sd.h> // Apple's DNS Service Discovery #import <dns_sd.h> // Apple's DNS Service Discovery
@ -44,10 +46,6 @@
// Define // Define
// //
#define PUBLIC /* public */
#define PRIVATE static
#define EXTERN extern
#if ! defined(INET6_ADDRSTRLEN) #if ! defined(INET6_ADDRSTRLEN)
# define INET6_ADDRSTRLEN 46 # define INET6_ADDRSTRLEN 46
#endif #endif
@ -78,8 +76,8 @@
} while(0); } while(0);
#if defined(_REENTRANT) #if defined(_REENTRANT)
# define THE_LOCK GSLazyLock *lock # define THE_LOCK GSLazyRecursiveLock *lock
# define CREATELOCK(x) x->lock = [GSLazyLock new] # define CREATELOCK(x) x->lock = [GSLazyRecursiveLock new]
# define LOCK(x) [x->lock lock] # define LOCK(x) [x->lock lock]
# define UNLOCK(x) [x->lock unlock] # define UNLOCK(x) [x->lock unlock]
# define DESTROYLOCK(x) DESTROY(x->lock) # define DESTROYLOCK(x) DESTROY(x->lock)
@ -194,21 +192,20 @@ NSString * const NSNetServicesErrorDomain = @"NSNetServicesErrorDomain";
// Prototype // Prototype
// //
PRIVATE NSDictionary static NSDictionary *CreateError(id sender, int errorCode);
*CreateError(id sender,
int errorCode);
PRIVATE int static int ConvertError(int errorCode);
ConvertError(int errorCode);
PRIVATE void DNSSD_API static void DNSSD_API
// used by NSNetServiceBrowser // used by NSNetServiceBrowser
EnumerationCallback(DNSServiceRef sdRef, EnumerationCallback(DNSServiceRef sdRef,
DNSServiceFlags flags, DNSServiceFlags flags,
uint32_t interfaceIndex, uint32_t interfaceIndex,
DNSServiceErrorType errorCode, DNSServiceErrorType errorCode,
const char *replyDomain, const char *replyDomain,
void *context), void *context);
static void DNSSD_API
BrowserCallback(DNSServiceRef sdRef, BrowserCallback(DNSServiceRef sdRef,
DNSServiceFlags flags, DNSServiceFlags flags,
uint32_t interfaceIndex, uint32_t interfaceIndex,
@ -216,7 +213,9 @@ PRIVATE void DNSSD_API
const char *replyName, const char *replyName,
const char *replyType, const char *replyType,
const char *replyDomain, const char *replyDomain,
void *context), void *context);
static void DNSSD_API
// used by NSNetService // used by NSNetService
ResolverCallback(DNSServiceRef sdRef, ResolverCallback(DNSServiceRef sdRef,
DNSServiceFlags flags, DNSServiceFlags flags,
@ -227,14 +226,18 @@ PRIVATE void DNSSD_API
uint16_t port, uint16_t port,
uint16_t txtLen, uint16_t txtLen,
const char *txtRecord, const char *txtRecord,
void *context), void *context);
static void DNSSD_API
RegistrationCallback(DNSServiceRef sdRef, RegistrationCallback(DNSServiceRef sdRef,
DNSServiceFlags flags, DNSServiceFlags flags,
DNSServiceErrorType errorCode, DNSServiceErrorType errorCode,
const char *name, const char *name,
const char *regtype, const char *regtype,
const char *domain, const char *domain,
void *context), void *context);
static void DNSSD_API
// used by NSNetService and NSNetServiceMonitor // used by NSNetService and NSNetServiceMonitor
QueryCallback(DNSServiceRef sdRef, QueryCallback(DNSServiceRef sdRef,
DNSServiceFlags flags, DNSServiceFlags flags,
@ -3095,7 +3098,7 @@ PRIVATE void DNSSD_API
* *
*/ */
PRIVATE NSDictionary * static NSDictionary *
CreateError(id sender, int errorCode) CreateError(id sender, int errorCode)
{ {
NSMutableDictionary *dictionary = nil; NSMutableDictionary *dictionary = nil;
@ -3122,7 +3125,7 @@ CreateError(id sender, int errorCode)
* *
*/ */
PRIVATE int static int
ConvertError(int errorCode) ConvertError(int errorCode)
{ {
INTERNALTRACE; INTERNALTRACE;
@ -3188,7 +3191,7 @@ ConvertError(int errorCode)
* *
*/ */
PRIVATE void static void
EnumerationCallback(DNSServiceRef sdRef, EnumerationCallback(DNSServiceRef sdRef,
DNSServiceFlags flags, DNSServiceFlags flags,
uint32_t interfaceIndex, uint32_t interfaceIndex,
@ -3210,7 +3213,7 @@ EnumerationCallback(DNSServiceRef sdRef,
* *
*/ */
PRIVATE void static void
BrowserCallback(DNSServiceRef sdRef, BrowserCallback(DNSServiceRef sdRef,
DNSServiceFlags flags, DNSServiceFlags flags,
uint32_t interfaceIndex, uint32_t interfaceIndex,
@ -3236,7 +3239,7 @@ BrowserCallback(DNSServiceRef sdRef,
* *
*/ */
PRIVATE void static void
ResolverCallback(DNSServiceRef sdRef, ResolverCallback(DNSServiceRef sdRef,
DNSServiceFlags flags, DNSServiceFlags flags,
uint32_t interfaceIndex, uint32_t interfaceIndex,
@ -3266,7 +3269,7 @@ ResolverCallback(DNSServiceRef sdRef,
* *
*/ */
PRIVATE void static void
RegistrationCallback(DNSServiceRef sdRef, RegistrationCallback(DNSServiceRef sdRef,
DNSServiceFlags flags, DNSServiceFlags flags,
DNSServiceErrorType errorCode, DNSServiceErrorType errorCode,
@ -3290,7 +3293,7 @@ RegistrationCallback(DNSServiceRef sdRef,
* *
*/ */
PRIVATE void static void
QueryCallback(DNSServiceRef sdRef, QueryCallback(DNSServiceRef sdRef,
DNSServiceFlags flags, DNSServiceFlags flags,
uint32_t interfaceIndex, uint32_t interfaceIndex,

28
Source/NSXMLParser.m
View file

@ -500,7 +500,7 @@ typedef struct NSXMLParserIvarsType
return this->column; return this->column;
} }
- (void) dealloc; - (void) dealloc
{ {
if (this != 0) if (this != 0)
{ {
@ -517,9 +517,9 @@ typedef struct NSXMLParserIvarsType
return _del; 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 - (id) initWithData: (NSData *)data
@ -549,9 +549,9 @@ typedef struct NSXMLParserIvarsType
return this->line; return this->line;
} }
- (void) setDelegate: (id)del - (void) setDelegate: (id)delegate
{ {
_handler = del; _handler = delegate;
} }
- (NSError *) parserError - (NSError *) parserError
@ -674,7 +674,7 @@ NSLog(@"_processTag <%@%@ %@>", flag?@"/": @"", tag, attributes);
} }
} }
- (NSString *) _entity; - (NSString *) _entity
{ {
// parse &xxx; sequence // parse &xxx; sequence
int c; int c;
@ -723,7 +723,7 @@ NSLog(@"_processTag <%@%@ %@>", flag?@"/": @"", tag, attributes);
return entity; return entity;
} }
- (NSString *) _qarg; - (NSString *) _qarg
{ {
// get argument (might be quoted) // get argument (might be quoted)
const unsigned char *ap = --this->cp; // argument start pointer const unsigned char *ap = --this->cp; // argument start pointer
@ -760,7 +760,7 @@ NSLog(@"_processTag <%@%@ %@>", flag?@"/": @"", tag, attributes);
return UTF8STR(ap, this->cp - ap); return UTF8STR(ap, this->cp - ap);
} }
- (BOOL) parse; - (BOOL) parse
{ {
// read XML (or HTML) file // read XML (or HTML) file
const unsigned char *vp = this->cp; // value pointer const unsigned char *vp = this->cp; // value pointer
@ -957,19 +957,19 @@ NSLog(@"_processTag <%@%@ %@>", flag?@"/": @"", tag, attributes);
return this->shouldResolveExternalEntities; 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 - (void) _setAcceptHTML: (BOOL) flag