From 3ea2d48f7e7a44be4e2594f9e99d4b259a597683 Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 3 Jul 2006 23:52:19 +0000 Subject: [PATCH] use %p for pointer formats gcc 4.1 warnings some 64bit preps minor code cleanups git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1297 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-gdl1/FrontBase2/FBBlobHandle.m | 2 +- sope-gdl1/FrontBase2/FBChannel.m | 12 +++---- sope-gdl1/GDLAccess/ChangeLog | 4 +++ sope-gdl1/GDLAccess/EOAdaptor.m | 4 +-- sope-gdl1/GDLAccess/EOAdaptorDataSource.m | 10 +++--- sope-gdl1/GDLAccess/EOAttribute.m | 6 ++-- sope-gdl1/GDLAccess/EODatabase.m | 18 ++++++---- sope-gdl1/GDLAccess/EODatabaseChannel.m | 2 +- sope-gdl1/GDLAccess/EODatabaseContext.m | 10 +++--- sope-gdl1/GDLAccess/EOEntity.m | 20 ++++++----- sope-gdl1/GDLAccess/EOExpressionArray.m | 2 +- sope-gdl1/GDLAccess/EOFaultHandler.m | 2 +- sope-gdl1/GDLAccess/EOModel.m | 4 +-- sope-gdl1/GDLAccess/EOModelGroup.m | 2 +- sope-gdl1/GDLAccess/EOObjectUniquer.m | 4 +-- sope-gdl1/GDLAccess/EOQualifierScanner.m | 4 +-- sope-gdl1/GDLAccess/EOSQLExpression.m | 36 ++++++++++--------- sope-gdl1/GDLAccess/EOSQLQualifier.m | 9 ++--- sope-gdl1/GDLAccess/EOSelectSQLExpression.m | 14 ++++---- sope-gdl1/GDLAccess/GNUmakefile.preamble | 4 +++ sope-gdl1/GDLAccess/Version | 2 +- sope-gdl1/GDLAccess/fhs.make | 7 +++- sope-gdl1/GDLContentStore/ChangeLog | 4 +++ sope-gdl1/GDLContentStore/GCSChannelManager.m | 6 ++-- sope-gdl1/GDLContentStore/GCSFieldInfo.m | 2 +- sope-gdl1/GDLContentStore/GCSFolder.m | 6 ++-- sope-gdl1/GDLContentStore/GCSFolderManager.m | 4 +-- sope-gdl1/GDLContentStore/GCSFolderType.m | 8 +++-- sope-gdl1/GDLContentStore/Version | 2 +- sope-gdl1/MySQL/ChangeLog | 4 +++ sope-gdl1/MySQL/MySQL4Channel.m | 10 +++--- sope-gdl1/MySQL/MySQL4Values.m | 2 +- sope-gdl1/MySQL/Version | 2 +- sope-gdl1/PostgreSQL/ChangeLog | 4 +++ sope-gdl1/PostgreSQL/PGConnection.m | 4 +-- sope-gdl1/PostgreSQL/PostgreSQL72Channel.m | 12 +++---- sope-gdl1/PostgreSQL/Version | 2 +- sope-gdl1/SQLite3/ChangeLog | 4 +++ sope-gdl1/SQLite3/SQLiteChannel.m | 12 +++---- sope-gdl1/SQLite3/Version | 2 +- 40 files changed, 155 insertions(+), 113 deletions(-) diff --git a/sope-gdl1/FrontBase2/FBBlobHandle.m b/sope-gdl1/FrontBase2/FBBlobHandle.m index e6e7dcee..e87917fb 100644 --- a/sope-gdl1/FrontBase2/FBBlobHandle.m +++ b/sope-gdl1/FrontBase2/FBBlobHandle.m @@ -54,7 +54,7 @@ } - (NSString *)description { - return [NSString stringWithFormat:@"<%@[0x%08X]: id=%@>", + return [NSString stringWithFormat:@"<%@[0x%p]: id=%@>", NSStringFromClass([self class]), self, [self blobID]]; } diff --git a/sope-gdl1/FrontBase2/FBChannel.m b/sope-gdl1/FrontBase2/FBChannel.m index f1f54616..d220f18e 100644 --- a/sope-gdl1/FrontBase2/FBChannel.m +++ b/sope-gdl1/FrontBase2/FBChannel.m @@ -149,7 +149,7 @@ extern __declspec(import) void fbcInitialize(void); (char *)pwdDigest); if (self->fbdc == NULL) { if (isDebuggingEnabled) { - NSLog(@"FrontBase channel 0x%08X (db=%@, server=%@, digest=%s) " + NSLog(@"FrontBase channel 0x%p (db=%@, server=%@, digest=%s) " @"could not be opened: %s ..", self, [adaptor databaseName], [adaptor serverName], pwdDigest /* ? "yes" : "no"*/, @@ -180,7 +180,7 @@ extern __declspec(import) void fbcInitialize(void); md = fbcdcCreateSession(self->fbdc, (char *)[[NSString stringWithFormat: - @"GDL<0x%08X>", self] + @"GDL<0x%p>", self] cString], (char *)[[adaptor loginName] cString], // pwdDigest, @@ -188,7 +188,7 @@ extern __declspec(import) void fbcInitialize(void); (char *)[NSUserName() cString]); if (md == NULL) { if (isDebuggingEnabled) { - NSLog(@"FrontBase session (channel=0x%08X) couldn't be created, " + NSLog(@"FrontBase session (channel=0x%p) couldn't be created, " @" login=%@ password=%s user=%@: %s.", self, [adaptor loginName], [adaptor loginPassword], @@ -206,7 +206,7 @@ extern __declspec(import) void fbcInitialize(void); emd = fbcdcErrorMetaData(self->fbdc, md); - NSLog(@"FrontBase session (channel=0x%08X) couldn't be created:", self); + NSLog(@"FrontBase session (channel=0x%p) couldn't be created:", self); for (i = 0, count = fbcemdErrorCount(emd); i < count; i++) { unsigned code; @@ -259,7 +259,7 @@ extern __declspec(import) void fbcInitialize(void); #endif if (isDebuggingEnabled) - NSLog(@"FrontBase channel 0x%08X opened ..", self); + NSLog(@"FrontBase channel 0x%p opened ..", self); return result; } @@ -871,7 +871,7 @@ extern __declspec(import) void fbcInitialize(void); /* description */ - (NSString *)description { - return [NSString stringWithFormat:@"<%@[0x%08X]: open=%s fetching=%s>", + return [NSString stringWithFormat:@"<%@[0x%p]: open=%s fetching=%s>", NSStringFromClass([self class]), self, [self isOpen] ? "yes" : "no", diff --git a/sope-gdl1/GDLAccess/ChangeLog b/sope-gdl1/GDLAccess/ChangeLog index c52ff18e..753d8d19 100644 --- a/sope-gdl1/GDLAccess/ChangeLog +++ b/sope-gdl1/GDLAccess/ChangeLog @@ -1,3 +1,7 @@ +2006-07-04 Helge Hess + + * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.56) + 2005-10-13 Helge Hess * EOArrayProxy.m, EOPrimaryKeyDictionary.m, EOExpressionArray.m, diff --git a/sope-gdl1/GDLAccess/EOAdaptor.m b/sope-gdl1/GDLAccess/EOAdaptor.m index f0f7f1d2..ade6d985 100644 --- a/sope-gdl1/GDLAccess/EOAdaptor.m +++ b/sope-gdl1/GDLAccess/EOAdaptor.m @@ -137,7 +137,7 @@ /* Make adaptor bundle */ bundle = adaptorBundlePath ? [NSBundle bundleWithPath:adaptorBundlePath] - : nil; + : (NSBundle *)nil; /* Check bundle */ if (bundle == nil) { @@ -424,7 +424,7 @@ - (NSString *)description { return [NSString stringWithFormat: - @"<%@[0x%08X]: name=%@ " + @"<%@[0x%p]: name=%@ " @"model=%s connection-dict=%s>", NSStringFromClass([self class]), self, [self name], diff --git a/sope-gdl1/GDLAccess/EOAdaptorDataSource.m b/sope-gdl1/GDLAccess/EOAdaptorDataSource.m index 7768cde0..f0dd9666 100644 --- a/sope-gdl1/GDLAccess/EOAdaptorDataSource.m +++ b/sope-gdl1/GDLAccess/EOAdaptorDataSource.m @@ -846,7 +846,7 @@ static NSNotificationCenter *getNC(void ) { - (void)setFetchSpecification:(EOFetchSpecification *)_fs { if (![self->fetchSpecification isEqual:_fs]) { #if DEBUG && 0 - NSLog(@"%s: 0x%08X: fetch-spec mismatch:\n%@\n%@", + NSLog(@"%s: 0x%p: fetch-spec mismatch:\n%@\n%@", __PRETTY_FUNCTION__, self, self->fetchSpecification, _fs); #endif @@ -857,7 +857,7 @@ static NSNotificationCenter *getNC(void ) { } #if DEBUG && 0 else { - NSLog(@"%s: 0x%08X: no fetch-spec mismatch:\n%@\n%@\n", + NSLog(@"%s: 0x%p: no fetch-spec mismatch:\n%@\n%@\n", __PRETTY_FUNCTION__, self, self->fetchSpecification, _fs); } @@ -878,7 +878,7 @@ static NSNotificationCenter *getNC(void ) { NSMutableString *ms; ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<%@[0x%08X]:", NSStringFromClass([self class]), self]; + [ms appendFormat:@"<%@[0x%p]:", NSStringFromClass([self class]), self]; if (self->fetchSpecification != nil) [ms appendFormat:@" fspec=%@", self->fetchSpecification]; @@ -1213,7 +1213,7 @@ static NSNotificationCenter *getNC(void ) { id v; v = (v = [_keyValues valueForKey:[[attr columnName] lowercaseString]]) - ? v : null; + ? v : (id)null; keys[mapCnt] = attr; values[mapCnt] = v; @@ -1363,7 +1363,7 @@ static NSNotificationCenter *getNC(void ) { sqlKey = [_adaptor formatAttribute:attr]; - sqlValue = [_adaptor formatValue:self->value ? self->value : null + sqlValue = [_adaptor formatValue:(self->value ? self->value : (id)null) forAttribute:attr]; sql = nil; diff --git a/sope-gdl1/GDLAccess/EOAttribute.m b/sope-gdl1/GDLAccess/EOAttribute.m index 1fc5a87b..8642041c 100644 --- a/sope-gdl1/GDLAccess/EOAttribute.m +++ b/sope-gdl1/GDLAccess/EOAttribute.m @@ -434,7 +434,7 @@ static inline void _addToPropList(NSMutableDictionary *propertyList, NSDictionary *ui; ui = [NSDictionary dictionaryWithObjectsAndKeys: - *_value ? *_value : null, @"value", + *_value ? *_value : (id)null, @"value", self, @"attribute", nil]; @@ -466,7 +466,7 @@ static inline void _addToPropList(NSMutableDictionary *propertyList, [NSNumber numberWithUnsignedInt:self->width], @"maxWidth", [NSNumber numberWithUnsignedInt:len], @"width", - *_value ? *_value : null, @"value", + *_value ? *_value : (id)null, @"value", self, @"attribute", nil]; @@ -488,7 +488,7 @@ static inline void _addToPropList(NSMutableDictionary *propertyList, [NSNumber numberWithUnsignedInt:self->width], @"maxWidth", [NSNumber numberWithUnsignedInt:len], @"width", - *_value ? *_value : null, @"value", + *_value ? *_value : (id)null, @"value", self, @"attribute", nil]; diff --git a/sope-gdl1/GDLAccess/EODatabase.m b/sope-gdl1/GDLAccess/EODatabase.m index d56207b1..362be06c 100644 --- a/sope-gdl1/GDLAccess/EODatabase.m +++ b/sope-gdl1/GDLAccess/EODatabase.m @@ -245,7 +245,7 @@ static inline void _removeDatabaseInstance(EODatabase *_db) { - (void)forgetObject:(id)_object { /* - NSLog(@"DB[0x%08X]: forget object 0x%08X<%s> entity=%@", + NSLog(@"DB[0x%p]: forget object 0x%p<%s> entity=%@", self, _object, class_get_class_name(*(Class *)_object), [[_object entity] name]); */ @@ -267,7 +267,7 @@ static inline void _removeDatabaseInstance(EODatabase *_db) { #if 0 if (object) { if (![object isKindOfClass:[EOGenericRecord class]]) - NSLog(@"object 0x%08X pkey=%@ entity=%@", object, _key, _entity); + NSLog(@"object 0x%p pkey=%@ entity=%@", object, _key, _entity); } #endif return object; @@ -323,8 +323,8 @@ static inline void _removeDatabaseInstance(EODatabase *_db) { - (void)recordObject:(id)_object primaryKey:(NSDictionary *)_key entity:(EOEntity *)_entity - snapshot:(NSDictionary *)_snapshot { - + snapshot:(NSDictionary *)_snapshot +{ if (_object == nil) { [NSException raise:NSInvalidArgumentException format: @@ -359,9 +359,13 @@ static inline void _removeDatabaseInstance(EODatabase *_db) { } [objectsDictionary recordObject:_object - primaryKey:self->flags.isUniquingObjects?_key:nil - entity:self->flags.isUniquingObjects ?_entity:nil - snapshot:self->flags.isKeepingSnapshots?_snapshot:nil]; + primaryKey: + self->flags.isUniquingObjects ? _key:(NSDictionary *)nil + entity:self->flags.isUniquingObjects + ?_entity : (EOEntity *)nil + snapshot: + self->flags.isKeepingSnapshots + ? _snapshot : (NSDictionary *)nil]; } - (BOOL)isObject:(id)_object diff --git a/sope-gdl1/GDLAccess/EODatabaseChannel.m b/sope-gdl1/GDLAccess/EODatabaseChannel.m index 2853305d..a574521e 100644 --- a/sope-gdl1/GDLAccess/EODatabaseChannel.m +++ b/sope-gdl1/GDLAccess/EODatabaseChannel.m @@ -1255,7 +1255,7 @@ NSString *EODatabaseChannelDidLockObjectName = id nrel = [delegate databaseChannel:self relationshipForRow:row relationship:rel]; - rel = nrel ? nrel : rel; + rel = nrel ? nrel : (id)rel; } if ([rel isToMany]) { // Build to-many fault diff --git a/sope-gdl1/GDLAccess/EODatabaseContext.m b/sope-gdl1/GDLAccess/EODatabaseContext.m index 99346997..8dc29310 100644 --- a/sope-gdl1/GDLAccess/EODatabaseContext.m +++ b/sope-gdl1/GDLAccess/EODatabaseContext.m @@ -572,9 +572,9 @@ static inline void _checkTxInProgress(EODatabaseContext *self, EOObjectUniquer *cache = transactionStackTop->objectsDictionary; [cache recordObject:_object - primaryKey: self->isUniquingObjects ? _key : nil - entity: self->isUniquingObjects ? _entity : nil - snapshot: self->isKeepingSnapshots ? snapshot : nil]; + primaryKey: self->isUniquingObjects ? _key : (NSDictionary *)nil + entity: self->isUniquingObjects ? _entity : (EOEntity *)nil + snapshot:self->isKeepingSnapshots ? snapshot : (NSDictionary *)nil]; } } @@ -726,7 +726,7 @@ static inline void _checkTxInProgress(EODatabaseContext *self, - (NSString *)description { return [NSString stringWithFormat: - @"<%@[0x%08X]: #channels=%i tx-nesting=%i>", + @"<%@[0x%p]: #channels=%i tx-nesting=%i>", NSStringFromClass([self class]), self, [self->channels count], [self transactionNestingLevel]]; @@ -757,7 +757,7 @@ static Class EODatabaseContextClass = Nil; EODatabaseContextClass = _cclass; } + (Class)contextClassToRegister { - return EODatabaseContextClass ? EODatabaseContextClass : self; + return EODatabaseContextClass ? EODatabaseContextClass : (Class)self; } - (EODatabaseChannel *)availableChannel { diff --git a/sope-gdl1/GDLAccess/EOEntity.m b/sope-gdl1/GDLAccess/EOEntity.m index e85ae23d..b15a1f9a 100644 --- a/sope-gdl1/GDLAccess/EOEntity.m +++ b/sope-gdl1/GDLAccess/EOEntity.m @@ -751,7 +751,7 @@ static inline void _printIds(NSArray *a, const char *pfx, const char *indent) { if (indent == NULL) indent = " "; printf("%s", pfx); for (i = 0; i < [a count]; i++) - printf("%s0x%08X\n", indent, (unsigned)[a objectAtIndex:i]); + printf("%s0x%p\n", indent, (unsigned)[a objectAtIndex:i]); } #endif @@ -870,7 +870,7 @@ static inline BOOL _containsObject(NSArray *a, id obj) { - (NSString *)description { return [NSString stringWithFormat: - @"<%@[0x%08X]: name=%@ className=%@ tableName=%@ " + @"<%@[0x%p]: name=%@ className=%@ tableName=%@ " @"readOnly=%s>", NSStringFromClass([self class]), self, [self name], [self className], [self externalName], @@ -884,18 +884,20 @@ static inline BOOL _containsObject(NSArray *a, id obj) { @implementation EOEntity(ValuesConversion) - (NSDictionary *)convertValuesToModel:(NSDictionary *)aRow { - NSMutableDictionary *dict = [NSMutableDictionary dictionary]; - NSEnumerator *enumerator = [aRow keyEnumerator]; + NSMutableDictionary *dict; + NSEnumerator *enumerator; NSString *key; - while ((key = [enumerator nextObject])) { + dict = [NSMutableDictionary dictionary]; + enumerator = [aRow keyEnumerator]; + while ((key = [enumerator nextObject]) != nil) { id old = [aRow objectForKey:key]; id new = [[self attributeNamed:key] convertValueToModel:old]; - if (new) [dict setObject:new forKey:key]; + if (new != nil) [dict setObject:new forKey:key]; } - return [dict count] ? dict : nil; + return [dict count] > 0 ? dict : (NSMutableDictionary *)nil; } static int _compareByName(id obj1, id obj2, void * context) { @@ -961,7 +963,7 @@ static int _compareByName(id obj1, id obj2, void * context) { result = nil; e = [self->relationships objectEnumerator]; - while ((relship = [e nextObject])) { + while ((relship = [e nextObject]) != nil) { EOEntity *targetEntity; EOModel *extModel; @@ -973,7 +975,7 @@ static int _compareByName(id obj1, id obj2, void * context) { [result addObject:extModel]; } } - return result ? result : [NSArray array]; + return result != nil ? (id)result : [NSArray array]; } /* fetch specs */ diff --git a/sope-gdl1/GDLAccess/EOExpressionArray.m b/sope-gdl1/GDLAccess/EOExpressionArray.m index 2961ba90..c7b5d99e 100644 --- a/sope-gdl1/GDLAccess/EOExpressionArray.m +++ b/sope-gdl1/GDLAccess/EOExpressionArray.m @@ -275,7 +275,7 @@ NSMutableString *ms; ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; if (self->array) [ms appendFormat:@" array=%@", self->array]; if (self->prefix) [ms appendFormat:@" prefix='%@'", self->prefix]; diff --git a/sope-gdl1/GDLAccess/EOFaultHandler.m b/sope-gdl1/GDLAccess/EOFaultHandler.m index 4085cbc6..6121e2a5 100644 --- a/sope-gdl1/GDLAccess/EOFaultHandler.m +++ b/sope-gdl1/GDLAccess/EOFaultHandler.m @@ -197,7 +197,7 @@ /* description */ - (NSString *)descriptionForObject:(id)_fault { - return [NSString stringWithFormat:@"<%@[0x%08X]: on=%@>", + return [NSString stringWithFormat:@"<%@[0x%p]: on=%@>", NSStringFromClass(*(Class *)_fault), _fault, NSStringFromClass([self targetClass])]; diff --git a/sope-gdl1/GDLAccess/EOModel.m b/sope-gdl1/GDLAccess/EOModel.m index 93e1a852..0f25ee5f 100644 --- a/sope-gdl1/GDLAccess/EOModel.m +++ b/sope-gdl1/GDLAccess/EOModel.m @@ -203,7 +203,7 @@ void EOModel_linkCategories(void) { [self setCreateMutableObjects:NO]; } - return flags.errors ? (void)AUTORELEASE(self), (id)nil : self; + return flags.errors ? (void)AUTORELEASE(self), (id)nil : (id)self; } - (id)initWithName:(NSString*)_name { @@ -413,7 +413,7 @@ void EOModel_linkCategories(void) { NSString *s; ms = [NSMutableString stringWithCapacity:256]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; if ((s = [self name])) [ms appendFormat:@" name=%@", s]; if ((s = [self path])) [ms appendFormat:@" path=%@", s]; diff --git a/sope-gdl1/GDLAccess/EOModelGroup.m b/sope-gdl1/GDLAccess/EOModelGroup.m index 64839b83..5ec5e00a 100644 --- a/sope-gdl1/GDLAccess/EOModelGroup.m +++ b/sope-gdl1/GDLAccess/EOModelGroup.m @@ -233,7 +233,7 @@ static id classDelegate = nil; /* description */ - (NSString *)description { - return [NSString stringWithFormat:@"<%@[0x%08X]: models=%@>", + return [NSString stringWithFormat:@"<%@[0x%p]: models=%@>", NSStringFromClass([self class]), self, [[self modelNames] componentsJoinedByString:@","]]; diff --git a/sope-gdl1/GDLAccess/EOObjectUniquer.m b/sope-gdl1/GDLAccess/EOObjectUniquer.m index e6057f6e..8a4dc0a1 100644 --- a/sope-gdl1/GDLAccess/EOObjectUniquer.m +++ b/sope-gdl1/GDLAccess/EOObjectUniquer.m @@ -208,7 +208,7 @@ static inline void _removeUniquerInstance(EOObjectUniquer *_uniquer) { return; /* - NSLog(@"Uniquer[0x%08X]: forget object 0x%08X<%s> entity=%@", + NSLog(@"Uniquer[0x%p]: forget object 0x%p<%s> entity=%@", self, _object, class_get_class_name(*(Class *)_object), [[_object entity] name]); */ @@ -228,7 +228,7 @@ static inline void _removeUniquerInstance(EOObjectUniquer *_uniquer) { EOUniquerRecord *rec = NULL; id key = nil; - NSLog(@"uniquer 0x%08X forgetAllSnapshots ..", self); + NSLog(@"uniquer 0x%p forgetAllSnapshots ..", self); enumerator = NSEnumerateMapTable(self->objectsToRec); while (NSNextMapEnumeratorPair(&enumerator, (void**)(&key), (void**)(&rec))) { diff --git a/sope-gdl1/GDLAccess/EOQualifierScanner.m b/sope-gdl1/GDLAccess/EOQualifierScanner.m index 0286f316..dc82eecd 100644 --- a/sope-gdl1/GDLAccess/EOQualifierScanner.m +++ b/sope-gdl1/GDLAccess/EOQualifierScanner.m @@ -86,7 +86,7 @@ - (NSString*)convertCString:(va_list *)pString scanner:(FormatScanner*)scanner { char *string; string = va_arg(*pString, char*); - return string ? [NSString stringWithCString:string] : @""; + return string ? [NSString stringWithCString:string] : (id)@""; } - (NSString*)convertProperty:(va_list*)pString scanner:(FormatScanner*)scanner { @@ -166,7 +166,7 @@ else str = [str description]; - return (str == nil) ? @"" : str; + return (str == nil) ? (id)@"" : str; } - (NSString *)convertProperty:(NSEnumerator **)pString diff --git a/sope-gdl1/GDLAccess/EOSQLExpression.m b/sope-gdl1/GDLAccess/EOSQLExpression.m index 74781afb..30a69da7 100644 --- a/sope-gdl1/GDLAccess/EOSQLExpression.m +++ b/sope-gdl1/GDLAccess/EOSQLExpression.m @@ -144,9 +144,9 @@ NSString *EOBindVariableValueKey = @"value"; - (NSString *)convertValue:(va_list *)pString scanner:(FormatScanner *)scanner{ return (self->adaptor) - ? [self->adaptor formatValue:self->value?self->value:(id)null - forAttribute:attribute] - : self->value; + ? [self->adaptor formatValue:(self->value ? self->value : (NSString *)null) + forAttribute:attribute] + : (id)self->value; } @end /* EOInsertUpdateScannerHandler */ @@ -280,7 +280,7 @@ NSString *EOBindVariableValueKey = @"value"; joinClause: [self joinExpressionForRelationshipPaths:relationshipPaths] orderByClause:[self orderByClauseForFetchOrder:fetchOrder] - lockClause:flag ? [self lockClause] : nil]; + lockClause:flag ? [self lockClause] : (NSString *)nil]; self->content = [sql mutableCopy]; @@ -541,8 +541,9 @@ NSString *EOBindVariableValueKey = @"value"; withValue:(id)_value fromRow:(NSDictionary *)_row { return (self->adaptor) - ? [self->adaptor formatValue:_value?_value:null forAttribute:_attribute] - : [_value stringValue]; + ? [self->adaptor formatValue:(_value ? _value : (id)null) + forAttribute:_attribute] + : (id)[_value stringValue]; } - (id)updateListForRow:(NSDictionary *)row { @@ -573,7 +574,7 @@ NSString *EOBindVariableValueKey = @"value"; NSAssert1(attribute, @"attribute %@ should be non nil", attributeName); columnName = adaptor - ? [adaptor formatAttribute:attribute] + ? (NSString *)[adaptor formatAttribute:attribute] : [attribute columnName]; value = [row objectForKey:attributeName]; @@ -609,7 +610,7 @@ NSString *EOBindVariableValueKey = @"value"; NSAssert1(attribute, @"attribute %@ should be non nil", attributeName); columnName = adaptor - ? [adaptor formatAttribute:attribute] + ? (NSString *)[adaptor formatAttribute:attribute] : [attribute columnName]; if (first) first = NO; @@ -748,11 +749,11 @@ NSString *EOBindVariableValueKey = @"value"; NSString *columnName = nil; columnName = adaptor - ? [adaptor formatAttribute:attribute] + ? (NSString *)[adaptor formatAttribute:attribute] : [attribute columnName]; return alias - ? [NSString stringWithFormat:@"%@.%@", alias, columnName] + ? (NSString *)[NSString stringWithFormat:@"%@.%@", alias, columnName] : columnName; } @@ -804,7 +805,7 @@ NSString *EOBindVariableValueKey = @"value"; NSMutableString *ms; ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<0x%08X[%@]:\n", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:\n", self, NSStringFromClass([self class])]; if (self->entity) [ms appendFormat:@" entity=%@\n", self->entity]; if (self->adaptor) [ms appendFormat:@" adaptor=%@\n", self->adaptor]; @@ -948,7 +949,7 @@ NSString *EOBindVariableValueKey = @"value"; s = [NSMutableString stringWithCapacity:256]; - [s appendString:_selectString ? _selectString : @"SELECT"]; + [s appendString:_selectString ? _selectString : (NSString *)@"SELECT"]; [s appendString:@" "]; [s appendString:_columns]; [s appendString:@" FROM "]; @@ -1063,14 +1064,14 @@ NSString *EOBindVariableValueKey = @"value"; return NO; } -- (NSMutableDictionary *)bindVariableDictionaryForAttribute:(EOAttribute *)_attr +- (NSMutableDictionary *)bindVariableDictionaryForAttribute:(EOAttribute *)_a value:(id)_value { NSMutableDictionary *d; d = [NSMutableDictionary dictionaryWithCapacity:8]; - [d setObject:_attr forKey:EOBindVariableAttributeKey]; - [d setObject:_value ? _value : null forKey:EOBindVariableValueKey]; + [d setObject:_a forKey:EOBindVariableAttributeKey]; + [d setObject:_value ? _value : (id)null forKey:EOBindVariableValueKey]; return d; } @@ -1085,7 +1086,7 @@ NSString *EOBindVariableValueKey = @"value"; /* values */ + (NSString *)formatValue:(id)_value forAttribute:(EOAttribute *)_attribute { - return _value ? _value : null; + return _value != nil ? _value : (id)null; } - (NSString *)sqlStringForValue:(id)_value attributeNamed:(NSString *)_attrName { @@ -1108,7 +1109,8 @@ NSString *EOBindVariableValueKey = @"value"; return [bindVars objectForKey:EOBindVariablePlaceHolderKey]; } - return [[self class] formatValue:_value?_value:null forAttribute:attribute]; + return [[self class] formatValue:(_value ? _value : (id)null) + forAttribute:attribute]; } + (NSString *)sqlPatternFromShellPattern:(NSString *)_pattern { diff --git a/sope-gdl1/GDLAccess/EOSQLQualifier.m b/sope-gdl1/GDLAccess/EOSQLQualifier.m index ccf08d9b..173e8cf9 100644 --- a/sope-gdl1/GDLAccess/EOSQLQualifier.m +++ b/sope-gdl1/GDLAccess/EOSQLQualifier.m @@ -96,7 +96,7 @@ static EONull *null = nil; if ([source isEqual:null] || (source == nil)) checkNull = YES; - formattedLeft = [adaptor formatValue:source?source:null + formattedLeft = [adaptor formatValue:(source ? source : (id)null) forAttribute:destination]; } @@ -114,7 +114,7 @@ static EONull *null = nil; if ([destination isEqual:null] || (destination == nil)) checkNull = YES; - formattedRight = [adaptor formatValue:destination?destination:null + formattedRight = [adaptor formatValue:(destination ? destination :(id)null) forAttribute:source]; } @@ -184,7 +184,8 @@ static EONull *null = nil; /* return nil when is unable to build a complete qualifier for all primary key attributes */ - return pkey ? [self qualifierForRow:pkey entity:_entity] : nil; + return pkey != nil + ? [self qualifierForRow:pkey entity:_entity] : (EOSQLQualifier *)nil; } + (EOSQLQualifier*)qualifierForRow:(NSDictionary*)row @@ -564,7 +565,7 @@ handle_attribute(EOSQLQualifier *self, id object, id _relationshipPaths) NSMutableString *ms; ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<0x%08X[%@]:\n", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:\n", self, NSStringFromClass([self class])]; [ms appendFormat:@" entity=%@", [self->entity name]]; diff --git a/sope-gdl1/GDLAccess/EOSelectSQLExpression.m b/sope-gdl1/GDLAccess/EOSelectSQLExpression.m index f6340db3..36942df6 100644 --- a/sope-gdl1/GDLAccess/EOSelectSQLExpression.m +++ b/sope-gdl1/GDLAccess/EOSelectSQLExpression.m @@ -50,20 +50,21 @@ @end + @implementation EOSelectSQLExpression - (NSString *)expressionValueForAttribute:(EOAttribute *)attribute context:(id)context { - NSString *alias; - NSString *columnName; + NSString *alias; + NSString *columnName; - alias = [entitiesAndPropertiesAliases objectForKey:context]; + alias = [entitiesAndPropertiesAliases objectForKey:context]; - //NSLog(@"entitiesAndPropertiesAliases: %@", entitiesAndPropertiesAliases); + //NSLog(@"entitiesAndPropertiesAliases: %@", entitiesAndPropertiesAliases); columnName = adaptor - ? [adaptor formatAttribute:attribute] + ? (NSString *)[adaptor formatAttribute:attribute] : [attribute columnName]; if (alias) { @@ -76,6 +77,7 @@ @end /* EOSelectSQLExpression */ + @implementation EOSelectScannerHandler - (id)init { @@ -108,7 +110,7 @@ NSString *columnName; columnName = (adaptor) - ? [adaptor formatAttribute:self->attribute] + ? (NSString *)[adaptor formatAttribute:self->attribute] : [self->attribute columnName]; if (alias) diff --git a/sope-gdl1/GDLAccess/GNUmakefile.preamble b/sope-gdl1/GDLAccess/GNUmakefile.preamble index b8b6232b..a0141900 100644 --- a/sope-gdl1/GDLAccess/GNUmakefile.preamble +++ b/sope-gdl1/GDLAccess/GNUmakefile.preamble @@ -46,7 +46,11 @@ ADDITIONAL_LIB_DIRS += \ $(foreach dir,$(DEP_DIRS),-F$(GNUSTEP_BUILD_DIR)/$(dir)) endif +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +SYSTEM_LIB_DIR += -L/usr/local/lib64 -L/usr/lib64 +else SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib +endif # TODO: add prebinding address diff --git a/sope-gdl1/GDLAccess/Version b/sope-gdl1/GDLAccess/Version index 1e1b1b4f..0d71e766 100644 --- a/sope-gdl1/GDLAccess/Version +++ b/sope-gdl1/GDLAccess/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=55 +SUBMINOR_VERSION:=56 diff --git a/sope-gdl1/GDLAccess/fhs.make b/sope-gdl1/GDLAccess/fhs.make index 9b14b4c1..fde4ac11 100644 --- a/sope-gdl1/GDLAccess/fhs.make +++ b/sope-gdl1/GDLAccess/fhs.make @@ -5,9 +5,14 @@ ifneq ($(FHS_INSTALL_ROOT),) FHS_INCLUDE_DIR=$(FHS_INSTALL_ROOT)/include/ -FHS_LIB_DIR=$(FHS_INSTALL_ROOT)/lib/ FHS_BIN_DIR=$(FHS_INSTALL_ROOT)/bin/ +ifeq ($(findstring _64, $(GNUSTEP_TARGET_CPU)), _64) +SYSTEM_LIB_DIR += -L/usr/local/lib64 +else +SYSTEM_LIB_DIR += -L/usr/local/lib +endif + NONFHS_LIBDIR="$(GNUSTEP_LIBRARIES)/$(GNUSTEP_TARGET_LDIR)/" NONFHS_LIBNAME="$(LIBRARY_NAME)$(LIBRARY_NAME_SUFFIX)$(SHARED_LIBEXT)" NONFHS_BINDIR="$(GNUSTEP_TOOLS)/$(GNUSTEP_TARGET_LDIR)" diff --git a/sope-gdl1/GDLContentStore/ChangeLog b/sope-gdl1/GDLContentStore/ChangeLog index e9a2e3cf..29bf3ed5 100644 --- a/sope-gdl1/GDLContentStore/ChangeLog +++ b/sope-gdl1/GDLContentStore/ChangeLog @@ -1,3 +1,7 @@ +2006-07-04 Helge Hess + + * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.36) + 2005-08-16 Helge Hess * GNUmakefile, GNUmakefile.preamble: added OSX framework compilation diff --git a/sope-gdl1/GDLContentStore/GCSChannelManager.m b/sope-gdl1/GDLContentStore/GCSChannelManager.m index 1bfdee25..773387ca 100644 --- a/sope-gdl1/GDLContentStore/GCSChannelManager.m +++ b/sope-gdl1/GDLContentStore/GCSChannelManager.m @@ -422,7 +422,7 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60; NSMutableString *ms; ms = [NSMutableString stringWithCapacity:256]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; [ms appendFormat:@" #adaptors=%d", [self->urlToAdaptor count]]; @@ -499,9 +499,9 @@ static NSTimeInterval ChannelCollectionTimer = 5 * 60; NSMutableString *ms; ms = [NSMutableString stringWithCapacity:256]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; - [ms appendFormat:@" channel=0x%08X", self->channel]; + [ms appendFormat:@" channel=0x%p", self->channel]; if (self->creationTime) [ms appendFormat:@" created=%@", self->creationTime]; if (self->lastReleaseTime) [ms appendFormat:@" last-released=%@", self->lastReleaseTime]; diff --git a/sope-gdl1/GDLContentStore/GCSFieldInfo.m b/sope-gdl1/GDLContentStore/GCSFieldInfo.m index 8035091e..96a8578c 100644 --- a/sope-gdl1/GDLContentStore/GCSFieldInfo.m +++ b/sope-gdl1/GDLContentStore/GCSFieldInfo.m @@ -118,7 +118,7 @@ NSMutableString *ms; ms = [NSMutableString stringWithCapacity:256]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; [self appendAttributesToDescription:ms]; [ms appendString:@">"]; return ms; diff --git a/sope-gdl1/GDLContentStore/GCSFolder.m b/sope-gdl1/GDLContentStore/GCSFolder.m index 0c5a0e18..b4c1647c 100644 --- a/sope-gdl1/GDLContentStore/GCSFolder.m +++ b/sope-gdl1/GDLContentStore/GCSFolder.m @@ -555,10 +555,10 @@ static GCSStringFormatter *stringFormatter = nil; bsql = [self _generateUpdateStatementForRow:contentRow tableName:[self storeTableName] whereColumn:@"c_name" isEqualTo:_name - andColumn:(_baseVersion != 0 ? @"c_version" : nil) + andColumn:(_baseVersion != 0 ? (id)@"c_version" : (id)nil) isEqualTo:(_baseVersion != 0 ? [NSNumber numberWithUnsignedInt:_baseVersion] - : nil)]; + : (NSNumber *)nil)]; } /* execute */ @@ -833,7 +833,7 @@ static GCSStringFormatter *stringFormatter = nil; id tmp; ms = [NSMutableString stringWithCapacity:256]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; if (self->folderId) [ms appendFormat:@" id=%@", self->folderId]; diff --git a/sope-gdl1/GDLContentStore/GCSFolderManager.m b/sope-gdl1/GDLContentStore/GCSFolderManager.m index 53a56b33..68c9a9dc 100644 --- a/sope-gdl1/GDLContentStore/GCSFolderManager.m +++ b/sope-gdl1/GDLContentStore/GCSFolderManager.m @@ -643,10 +643,10 @@ static const char *GCSPathColumnPattern = "c_path%i"; NSMutableString *ms; ms = [NSMutableString stringWithCapacity:256]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; [ms appendFormat:@" url=%@", [self->folderInfoLocation absoluteString]]; - [ms appendFormat:@" channel-manager=0x%08X", [self channelManager]]; + [ms appendFormat:@" channel-manager=0x%p", [self channelManager]]; [ms appendString:@">"]; return ms; diff --git a/sope-gdl1/GDLContentStore/GCSFolderType.m b/sope-gdl1/GDLContentStore/GCSFolderType.m index e59e389d..76f2d36b 100644 --- a/sope-gdl1/GDLContentStore/GCSFolderType.m +++ b/sope-gdl1/GDLContentStore/GCSFolderType.m @@ -154,8 +154,10 @@ - (GCSFieldExtractor *)quickExtractor { Class clazz; - if (self->extractor) - return [self->extractor isNotNull] ? self->extractor : nil; + if (self->extractor != nil) { + return [self->extractor isNotNull] + ? self->extractor : (GCSFieldExtractor *)nil; + } clazz = self->extractorClassName ? NSClassFromString(self->extractorClassName) @@ -179,7 +181,7 @@ NSMutableString *ms; ms = [NSMutableString stringWithCapacity:256]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; [ms appendFormat:@" blobtable='%@'", self->blobTablePattern]; [ms appendFormat:@" quicktable='%@'", self->quickTablePattern]; diff --git a/sope-gdl1/GDLContentStore/Version b/sope-gdl1/GDLContentStore/Version index 7db0d139..f9f8f165 100644 --- a/sope-gdl1/GDLContentStore/Version +++ b/sope-gdl1/GDLContentStore/Version @@ -2,7 +2,7 @@ MAJOR_VERSION:=4 MINOR_VERSION:=5 -SUBMINOR_VERSION:=35 +SUBMINOR_VERSION:=36 # v4.5.29 requires libNGExtensions v4.5.161 # v4.5.26 does not require libNGiCal anymore diff --git a/sope-gdl1/MySQL/ChangeLog b/sope-gdl1/MySQL/ChangeLog index a88466e0..3bca6721 100644 --- a/sope-gdl1/MySQL/ChangeLog +++ b/sope-gdl1/MySQL/ChangeLog @@ -1,3 +1,7 @@ +2006-07-04 Helge Hess + + * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.13) + 2005-07-29 Helge Hess * v4.5.12 diff --git a/sope-gdl1/MySQL/MySQL4Channel.m b/sope-gdl1/MySQL/MySQL4Channel.m index 89fd9930..1d40a120 100644 --- a/sope-gdl1/MySQL/MySQL4Channel.m +++ b/sope-gdl1/MySQL/MySQL4Channel.m @@ -181,7 +181,7 @@ static int openConnectionCount = 0; } if (isDebuggingEnabled) - NSLog(@"MySQL4 connection established 0x%08X", self->_connection); + NSLog(@"MySQL4 connection established 0x%p", self->_connection); #if 0 NSLog(@"---------- %s: %@ opens channel count[%d]", __PRETTY_FUNCTION__, @@ -196,7 +196,7 @@ static int openConnectionCount = 0; #endif if (isDebuggingEnabled) { - NSLog(@"MySQL4 channel 0x%08X opened (connection=0x%08X,%s)", + NSLog(@"MySQL4 channel 0x%p opened (connection=0x%p,%s)", (unsigned)self, self->_connection, cDBName); } return YES; @@ -216,8 +216,8 @@ static int openConnectionCount = 0; if (isDebuggingEnabled) { fprintf(stderr, - "MySQL4 connection dropped 0x%08X (channel=0x%08X)\n", - (unsigned)self->_connection, (unsigned)self); + "MySQL4 connection dropped 0x%p (channel=0x%p)\n", + self->_connection, self); } self->_connection = NULL; } @@ -679,7 +679,7 @@ static int openConnectionCount = 0; NSMutableString *ms; ms = [NSMutableString stringWithCapacity:64]; - [ms appendFormat:@"<%@[0x%08X] connection=0x%08X", + [ms appendFormat:@"<%@[0x%p] connection=0x%p", NSStringFromClass([self class]), self, (unsigned)self->_connection]; diff --git a/sope-gdl1/MySQL/MySQL4Values.m b/sope-gdl1/MySQL/MySQL4Values.m index 6efd3480..608b79b7 100644 --- a/sope-gdl1/MySQL/MySQL4Values.m +++ b/sope-gdl1/MySQL/MySQL4Values.m @@ -82,7 +82,7 @@ return nil; } NSLog(@"WARNING(%s): %@ falling back to NSString for MySQL4 value" - @" (type %i, 0x%08X, len=%d)", + @" (type %i, 0x%p, len=%d)", __PRETTY_FUNCTION__, NSStringFromClass([self class]), _type, _v, _len); diff --git a/sope-gdl1/MySQL/Version b/sope-gdl1/MySQL/Version index cda34ac9..76aa6eb9 100644 --- a/sope-gdl1/MySQL/Version +++ b/sope-gdl1/MySQL/Version @@ -1,3 +1,3 @@ # Version file -SUBMINOR_VERSION:=12 +SUBMINOR_VERSION:=13 diff --git a/sope-gdl1/PostgreSQL/ChangeLog b/sope-gdl1/PostgreSQL/ChangeLog index 3b601793..bc493695 100644 --- a/sope-gdl1/PostgreSQL/ChangeLog +++ b/sope-gdl1/PostgreSQL/ChangeLog @@ -1,3 +1,7 @@ +2006-07-04 Helge Hess + + * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.46) + 2005-08-16 Helge Hess * GNUmakefile.preamble: added OSX framework compilation (v4.5.45) diff --git a/sope-gdl1/PostgreSQL/PGConnection.m b/sope-gdl1/PostgreSQL/PGConnection.m index 78ac0a93..97367995 100644 --- a/sope-gdl1/PostgreSQL/PGConnection.m +++ b/sope-gdl1/PostgreSQL/PGConnection.m @@ -207,9 +207,9 @@ static BOOL debugOn = NO; NSMutableString *ms; ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<0x%08X[%@]: ", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]: ", self, NSStringFromClass([self class])]; if ([self isValid]) - [ms appendFormat:@" connection=0x%08X", self->_connection]; + [ms appendFormat:@" connection=0x%p", self->_connection]; else [ms appendString:@" not-connected"]; [ms appendString:@">"]; diff --git a/sope-gdl1/PostgreSQL/PostgreSQL72Channel.m b/sope-gdl1/PostgreSQL/PostgreSQL72Channel.m index f9aa4ecc..4ea1fc3c 100644 --- a/sope-gdl1/PostgreSQL/PostgreSQL72Channel.m +++ b/sope-gdl1/PostgreSQL/PostgreSQL72Channel.m @@ -226,7 +226,7 @@ static int openConnectionCount = 0; openConnectionCount++; if (isDebuggingEnabled) { - NSLog(@"PostgreSQL72 channel 0x%08X opened (connection=%@)", + NSLog(@"PostgreSQL72 channel 0x%p opened (connection=%@)", (unsigned)self, self->connection); } return YES; @@ -257,8 +257,8 @@ static int openConnectionCount = 0; if (isDebuggingEnabled) { fprintf(stderr, - "PostgreSQL72 connection dropped 0x%08X (channel=0x%08X)\n", - (unsigned)self->connection, (unsigned)self); + "PostgreSQL72 connection dropped 0x%p (channel=0x%p)\n", + self->connection, self); } [self->connection release]; self->connection = nil; @@ -641,7 +641,7 @@ static int openConnectionCount = 0; } if (isDebuggingEnabled) - NSLog(@"PG0x%08X SQL: %@", (unsigned)self, _expression); + NSLog(@"PG0x%p SQL: %@", (unsigned)self, _expression); [self _resetEvaluationState]; @@ -710,7 +710,7 @@ static int openConnectionCount = 0; NSMutableString *ms; ms = [NSMutableString stringWithCapacity:128]; - [ms appendFormat:@"<0x%08X[%@]:", self, NSStringFromClass([self class])]; + [ms appendFormat:@"<0x%p[%@]:", self, NSStringFromClass([self class])]; if (self->connection) [ms appendFormat:@" connection=%@", self->connection]; else @@ -737,7 +737,7 @@ static int openConnectionCount = 0; seq = [seqName length] > 0 ? [StringClass stringWithFormat:@"SELECT NEXTVAL ('%@')", seqName] - : [adaptor newKeyExpression]; + : (id)[adaptor newKeyExpression]; // TODO: since we use evaluateExpressionX, we should not see exceptions? NS_DURING { diff --git a/sope-gdl1/PostgreSQL/Version b/sope-gdl1/PostgreSQL/Version index aab40918..324bcc30 100644 --- a/sope-gdl1/PostgreSQL/Version +++ b/sope-gdl1/PostgreSQL/Version @@ -1,5 +1,5 @@ # version file -SUBMINOR_VERSION:=45 +SUBMINOR_VERSION:=46 # v4.5.41 requires libGDLAccess v4.5.50 diff --git a/sope-gdl1/SQLite3/ChangeLog b/sope-gdl1/SQLite3/ChangeLog index 72e80775..7bc84565 100644 --- a/sope-gdl1/SQLite3/ChangeLog +++ b/sope-gdl1/SQLite3/ChangeLog @@ -1,3 +1,7 @@ +2006-07-04 Helge Hess + + * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.21) + 2005-08-16 Helge Hess * GNUmakefile.preamble: added OSX framework compilation (v4.5.20) diff --git a/sope-gdl1/SQLite3/SQLiteChannel.m b/sope-gdl1/SQLite3/SQLiteChannel.m index 92b0e997..acc1e472 100644 --- a/sope-gdl1/SQLite3/SQLiteChannel.m +++ b/sope-gdl1/SQLite3/SQLiteChannel.m @@ -148,7 +148,7 @@ static int openConnectionCount = 0; } if (isDebuggingEnabled) - NSLog(@"SQLite connection established 0x%08X", self->_connection); + NSLog(@"SQLite connection established 0x%p", self->_connection); #if 0 NSLog(@"---------- %s: %@ opens channel count[%d]", __PRETTY_FUNCTION__, @@ -163,7 +163,7 @@ static int openConnectionCount = 0; #endif if (isDebuggingEnabled) { - NSLog(@"SQLite channel 0x%08X opened (connection=0x%08X,%s)", + NSLog(@"SQLite channel 0x%p opened (connection=0x%p,%s)", (unsigned)self, self->_connection, cDBName); } return YES; @@ -185,8 +185,8 @@ static int openConnectionCount = 0; if (isDebuggingEnabled) { fprintf(stderr, - "SQLite connection dropped 0x%08X (channel=0x%08X)\n", - (unsigned)self->_connection, (unsigned)self); + "SQLite connection dropped 0x%p (channel=0x%p)\n", + self->_connection, self); } self->_connection = NULL; } @@ -617,7 +617,7 @@ static int openConnectionCount = 0; NSMutableString *ms; ms = [NSMutableString stringWithCapacity:64]; - [ms appendFormat:@"<%@[0x%08X] connection=0x%08X", + [ms appendFormat:@"<%@[0x%p] connection=0x%p", NSStringFromClass([self class]), self, (unsigned)self->_connection]; @@ -643,7 +643,7 @@ static int openConnectionCount = 0; seq = ([seqName length] > 0) ? [NSString stringWithFormat:@"SELECT NEXTVAL ('%@')", seqName] - : [adaptor newKeyExpression]; + : (id)[adaptor newKeyExpression]; NS_DURING { if ([self evaluateExpression:seq]) { diff --git a/sope-gdl1/SQLite3/Version b/sope-gdl1/SQLite3/Version index 26ee2eeb..6374136a 100644 --- a/sope-gdl1/SQLite3/Version +++ b/sope-gdl1/SQLite3/Version @@ -1,5 +1,5 @@ # Version file -SUBMINOR_VERSION:=20 +SUBMINOR_VERSION:=21 # v4.5.17 requires libGDLAccess v4.5.50 -- 2.39.5