* GSWeb.framework/GSWMultiKeyDictionary.h/m:

Adapt API to current NSDictionary API.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@30231 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Ayers 2010-04-24 12:26:59 +00:00
parent 186f386a23
commit 411bedc4a6
3 changed files with 78 additions and 71 deletions

121
ChangeLog
View file

@ -1,83 +1,90 @@
2010-04-24 David Ayers <ayers@fsfe.org>
* GSWeb.framework/GSWMultiKeyDictionary.h/m:
Adapt API to current NSDictionary API.
2010-04-23 David Wetzel <dave@turbocat.de> 2010-04-23 David Wetzel <dave@turbocat.de>
Examples/hello/INSTALL
* updated to flags really needed * Examples/hello/INSTALL:
updated to flags really needed
2010-04-16 David Wetzel <dave@turbocat.de> 2010-04-16 David Wetzel <dave@turbocat.de>
GSWApplication.*:
* use [[NSThread currentThread] threadDictionary] * GSWApplication.*:
GSWMultiKeyDictionary.m use [[NSThread currentThread] threadDictionary]
* fix format * GSWMultiKeyDictionary.m: fix format
GSWRequest.m * GSWRequest.m: fix potential double release
* fix potential double release * GSWComponentRequestHandler.*: add comments for rejectFavicon
GSWComponentRequestHandler.* * GSWSessionTimeOutManager.m: fix index
* add comments for rejectFavicon * NSString+HTML.m, GSWBaseParser.m, GSWDeclarationParser.m,
GSWSessionTimeOutManager.m * GSWHTMLRawParser.m: use NSZoneMalloc()
* fix index * GSWMultiKeyDictionary.m: fixed description
NSString+HTML.m, GSWBaseParser.m, GSWDeclarationParser.m, GSWHTMLRawParser.m
* use NSZoneMalloc()
GSWMultiKeyDictionary.m:
* fixed description
2010-04-16 David Wetzel <dave@turbocat.de> 2010-04-16 David Wetzel <dave@turbocat.de>
* fixed memory leak
* ported to OS X (beta) * fixed memory leak
* depricated GSW naming * ported to OS X (beta)
* depricated GSW naming
2010-04-16 David Wetzel <dave@turbocat.de> 2010-04-16 David Wetzel <dave@turbocat.de>
GSWeb.framework
* Many warnings fixed. * GSWeb.framework: Many warnings fixed.
* Removed GDL dependency. Removed GDL dependency.
* NSKeyValueCoding is now MacOS X compatible. * NSKeyValueCoding is now MacOS X compatible.
2010-04-15 David Wetzel <dave@turbocat.de> 2010-04-15 David Wetzel <dave@turbocat.de>
new GSWDatabase Framework for EOF/GDL based applications
not tested yet! * new GSWDatabase Framework for EOF/GDL based applications
GSWeb.framework: not tested yet!
* Moved WODisplayGroup.? to GSWDatabase * GSWeb.framework:
changed: GNUmakefile GSWeb.h GSWWOCompatibility.h * Moved WODisplayGroup.? to GSWDatabase
* GSWApplication: removed EOF changed: GNUmakefile GSWeb.h GSWWOCompatibility.h
* small cleanups * GSWApplication: removed EOF
* GSWUtils.m EONull -> NSNull * small cleanups
* GSWApplication+Defaults.m, GSWPrivate.h additions for Monitoring * GSWUtils.m EONull -> NSNull
* added NSObject+XML.? * GSWApplication+Defaults.m, GSWPrivate.h additions for Monitoring
* added NSObject+XML.?
2010-04-14 David Wetzel <dave@turbocat.de> 2010-04-14 David Wetzel <dave@turbocat.de>
Apache2/GNUmakefile.in
* changed flags, clean now * Apache2/GNUmakefile.in: changed flags, clean now
2010-01-20 David Wetzel <dave@turbocat.de> 2010-01-20 David Wetzel <dave@turbocat.de>
GSWeb.framework/GSWApplication.m
* added _setHostAddress:, hostAddress
GSWeb.framework/GSWRequest.h * GSWeb.framework/GSWApplication.m:
* added _originatingAddress, _originatingPort added _setHostAddress:, hostAddress
GSWeb.framework/GSWDisplayGroup.h * GSWeb.framework/GSWRequest.h:
* changed undoManager to be id as compile fix for TCSDB. added _originatingAddress, _originatingPort
GSWeb.framework/GSWApplication+Defaults.m * GSWeb.framework/GSWDisplayGroup.h:
* added hostAddress changed undoManager to be id as compile fix for TCSDB.
GSWeb.framework/GSWHTTPIO.h * GSWeb.framework/GSWApplication+Defaults.m:
* added _setAlwaysAppendContentLength added hostAddress
GSWeb.framework/GSWHTTPIO.m * GSWeb.framework/GSWHTTPIO.h:
* added _alwaysAppendContentLength added _setAlwaysAppendContentLength
* added + (void) _getConnectionInfoFromHandle:remoteAddress:remotePort:
* set originatingAddress and port to request now.
GSWeb.framework/GSWApplication.h * GSWeb.framework/GSWHTTPIO.m:
* added _hostAddress, hostAddress, _setHostAddress added _alwaysAppendContentLength
* removed lots of @interface lines. added + (void) _getConnectionInfoFromHandle:remoteAddress:remotePort:
set originatingAddress and port to request now.
* GSWeb.framework/GSWApplication.h:
added _hostAddress, hostAddress, _setHostAddress
removed lots of @interface lines.
2009-06-12 David Wetzel <dave@turbocat.de> 2009-06-12 David Wetzel <dave@turbocat.de>
GSWAdaptors/Apache2/GNUmakefile.in
* added -g to include debug info as default * GSWAdaptors/Apache2/GNUmakefile.in:
added -g to include debug info as default
2009-06-12 David Wetzel <dave@turbocat.de> 2009-06-12 David Wetzel <dave@turbocat.de>
GSWAdaptors/Apache2/mod_gsw.c:
* removed unused read_sock() * GSWAdaptors/Apache2/mod_gsw.c:
* reformated read_sock_line() removed unused read_sock()
reformated read_sock_line()
2009-04-14 David Ayers <ayers@fsfe.org> 2009-04-14 David Ayers <ayers@fsfe.org>

View file

@ -40,7 +40,7 @@
}; };
+(id)dictionary; +(id)dictionary;
-(id)initWithCapacity:(unsigned int)capacity; -(id)initWithCapacity:(NSUInteger)capacity;
-(void)setObject:(id)object -(void)setObject:(id)object
forKeys:(id)keys,...; forKeys:(id)keys,...;

View file

@ -128,7 +128,7 @@ struct _GSWMapBucket {
struct _GSWMapBase { struct _GSWMapBase {
NSZone *zone; NSZone *zone;
unsigned int nodeSize; /* Size of a node */ NSUInteger nodeSize; /* Size of a node */
GSWMapTable firstTable; GSWMapTable firstTable;
GSWMapTable freeTables; /* List of unused tables. */ GSWMapTable freeTables; /* List of unused tables. */
@ -857,7 +857,7 @@ static void GSWMapCleanMap(GSWMapTable map)
if (map->nodeCount > 0) if (map->nodeCount > 0)
{ {
GSWMapBucket bucket = map->buckets; GSWMapBucket bucket = map->buckets;
unsigned int i; NSUInteger i;
GSWMapNode startNode = 0; GSWMapNode startNode = 0;
GSWMapNode prevNode = 0; GSWMapNode prevNode = 0;
GSWMapNode node = NULL; GSWMapNode node = NULL;
@ -922,7 +922,7 @@ static void GSWMapCleanBase(GSWMapBase base)
//-------------------------------------------------------------------- //--------------------------------------------------------------------
static void GSWMapEmptyBase(GSWMapBase base) static void GSWMapEmptyBase(GSWMapBase base)
{ {
unsigned int i=0; NSUInteger i=0;
GSWMapEmptyMap(base->firstTable); GSWMapEmptyMap(base->firstTable);
base->firstTable=NULL; base->firstTable=NULL;
@ -983,10 +983,10 @@ static void GSWMapBaseInitWithZoneAndCapacity(GSWMapBase base,
//============================================================================== //==============================================================================
@interface GSWMultiKeyDictionary(Private) @interface GSWMultiKeyDictionary(Private)
+(id)dictionaryWithNodeSize:(unsigned int)nodeSize; +(id)dictionaryWithNodeSize:(NSUInteger)nodeSize;
-(id)initWithNodeSize:(unsigned int)nodeSize; -(id)initWithNodeSize:(NSUInteger)nodeSize;
-(id)initWithNodeSize:(unsigned int)nodeSize -(id)initWithNodeSize:(NSUInteger)nodeSize
capacity:(unsigned int)capacity; capacity:(NSUInteger)capacity;
-(void)setObject:(id)object -(void)setObject:(id)object
forKeys:(id*)keys forKeys:(id*)keys
@ -1004,7 +1004,7 @@ static void GSWMapBaseInitWithZoneAndCapacity(GSWMapBase base,
@implementation GSWMultiKeyDictionary : NSObject @implementation GSWMultiKeyDictionary : NSObject
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
+(id)dictionaryWithNodeSize:(unsigned int)nodeSize +(id)dictionaryWithNodeSize:(NSUInteger)nodeSize
{ {
NSCAssert2(nodeSize>=sizeof(GSWMapNode_t), NSCAssert2(nodeSize>=sizeof(GSWMapNode_t),
@"Bad node size: %u < %u", @"Bad node size: %u < %u",
@ -1020,7 +1020,7 @@ static void GSWMapBaseInitWithZoneAndCapacity(GSWMapBase base,
}; };
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
-(id)initWithNodeSize:(unsigned int)nodeSize -(id)initWithNodeSize:(NSUInteger)nodeSize
{ {
LOGObjectFnStart(); LOGObjectFnStart();
NSCAssert2(nodeSize>=sizeof(GSWMapNode_t), NSCAssert2(nodeSize>=sizeof(GSWMapNode_t),
@ -1043,8 +1043,8 @@ static void GSWMapBaseInitWithZoneAndCapacity(GSWMapBase base,
}; };
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
-(id)initWithNodeSize:(unsigned int)nodeSize -(id)initWithNodeSize:(NSUInteger)nodeSize
capacity:(unsigned int)capacity capacity:(NSUInteger)capacity
{ {
LOGObjectFnStart(); LOGObjectFnStart();
NSCAssert2(nodeSize>=sizeof(GSWMapNode_t), NSCAssert2(nodeSize>=sizeof(GSWMapNode_t),
@ -1068,7 +1068,7 @@ static void GSWMapBaseInitWithZoneAndCapacity(GSWMapBase base,
}; };
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
-(id)initWithCapacity:(unsigned int)capacity -(id)initWithCapacity:(NSUInteger)capacity
{ {
LOGObjectFnStart(); LOGObjectFnStart();
[self initWithNodeSize:sizeof(GSWMapNode_t) [self initWithNodeSize:sizeof(GSWMapNode_t)