}
- (NSString *)description {
- return [NSString stringWithFormat:@"<%@[0x%08X]: id=%@>",
+ return [NSString stringWithFormat:@"<%@[0x%p]: id=%@>",
NSStringFromClass([self class]), self,
[self blobID]];
}
(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"*/,
md = fbcdcCreateSession(self->fbdc,
(char *)[[NSString stringWithFormat:
- @"GDL<0x%08X>", self]
+ @"GDL<0x%p>", self]
cString],
(char *)[[adaptor loginName] cString],
// pwdDigest,
(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],
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;
#endif
if (isDebuggingEnabled)
- NSLog(@"FrontBase channel 0x%08X opened ..", self);
+ NSLog(@"FrontBase channel 0x%p opened ..", self);
return result;
}
/* 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",
+2006-07-04 Helge Hess <helge.hess@opengroupware.org>
+
+ * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.56)
+
2005-10-13 Helge Hess <helge.hess@skyrix.com>
* EOArrayProxy.m, EOPrimaryKeyDictionary.m, EOExpressionArray.m,
/* Make adaptor bundle */
bundle = adaptorBundlePath
? [NSBundle bundleWithPath:adaptorBundlePath]
- : nil;
+ : (NSBundle *)nil;
/* Check bundle */
if (bundle == nil) {
- (NSString *)description {
return [NSString stringWithFormat:
- @"<%@[0x%08X]: name=%@ "
+ @"<%@[0x%p]: name=%@ "
@"model=%s connection-dict=%s>",
NSStringFromClass([self class]), self,
[self name],
- (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
}
#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);
}
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];
id v;
v = (v = [_keyValues valueForKey:[[attr columnName] lowercaseString]])
- ? v : null;
+ ? v : (id)null;
keys[mapCnt] = attr;
values[mapCnt] = v;
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;
NSDictionary *ui;
ui = [NSDictionary dictionaryWithObjectsAndKeys:
- *_value ? *_value : null, @"value",
+ *_value ? *_value : (id)null, @"value",
self, @"attribute",
nil];
[NSNumber numberWithUnsignedInt:self->width],
@"maxWidth",
[NSNumber numberWithUnsignedInt:len], @"width",
- *_value ? *_value : null, @"value",
+ *_value ? *_value : (id)null, @"value",
self, @"attribute",
nil];
[NSNumber numberWithUnsignedInt:self->width],
@"maxWidth",
[NSNumber numberWithUnsignedInt:len], @"width",
- *_value ? *_value : null, @"value",
+ *_value ? *_value : (id)null, @"value",
self, @"attribute",
nil];
- (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]);
*/
#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;
- (void)recordObject:(id)_object
primaryKey:(NSDictionary *)_key
entity:(EOEntity *)_entity
- snapshot:(NSDictionary *)_snapshot {
-
+ snapshot:(NSDictionary *)_snapshot
+{
if (_object == nil) {
[NSException raise:NSInvalidArgumentException
format:
}
[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
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
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];
}
}
- (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]];
EODatabaseContextClass = _cclass;
}
+ (Class)contextClassToRegister {
- return EODatabaseContextClass ? EODatabaseContextClass : self;
+ return EODatabaseContextClass ? EODatabaseContextClass : (Class)self;
}
- (EODatabaseChannel *)availableChannel {
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
- (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],
@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) {
result = nil;
e = [self->relationships objectEnumerator];
- while ((relship = [e nextObject])) {
+ while ((relship = [e nextObject]) != nil) {
EOEntity *targetEntity;
EOModel *extModel;
[result addObject:extModel];
}
}
- return result ? result : [NSArray array];
+ return result != nil ? (id)result : [NSArray array];
}
/* fetch specs */
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];
/* description */
- (NSString *)descriptionForObject:(id)_fault {
- return [NSString stringWithFormat:@"<%@[0x%08X]: on=%@>",
+ return [NSString stringWithFormat:@"<%@[0x%p]: on=%@>",
NSStringFromClass(*(Class *)_fault),
_fault,
NSStringFromClass([self targetClass])];
[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 {
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];
/* description */
- (NSString *)description {
- return [NSString stringWithFormat:@"<%@[0x%08X]: models=%@>",
+ return [NSString stringWithFormat:@"<%@[0x%p]: models=%@>",
NSStringFromClass([self class]),
self,
[[self modelNames] componentsJoinedByString:@","]];
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]);
*/
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))) {
- (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 {
else
str = [str description];
- return (str == nil) ? @"" : str;
+ return (str == nil) ? (id)@"" : str;
}
- (NSString *)convertProperty:(NSEnumerator **)pString
- (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 */
joinClause:
[self joinExpressionForRelationshipPaths:relationshipPaths]
orderByClause:[self orderByClauseForFetchOrder:fetchOrder]
- lockClause:flag ? [self lockClause] : nil];
+ lockClause:flag ? [self lockClause] : (NSString *)nil];
self->content = [sql mutableCopy];
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 {
NSAssert1(attribute, @"attribute %@ should be non nil", attributeName);
columnName = adaptor
- ? [adaptor formatAttribute:attribute]
+ ? (NSString *)[adaptor formatAttribute:attribute]
: [attribute columnName];
value = [row objectForKey:attributeName];
NSAssert1(attribute, @"attribute %@ should be non nil", attributeName);
columnName = adaptor
- ? [adaptor formatAttribute:attribute]
+ ? (NSString *)[adaptor formatAttribute:attribute]
: [attribute columnName];
if (first) first = NO;
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;
}
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];
s = [NSMutableString stringWithCapacity:256];
- [s appendString:_selectString ? _selectString : @"SELECT"];
+ [s appendString:_selectString ? _selectString : (NSString *)@"SELECT"];
[s appendString:@" "];
[s appendString:_columns];
[s appendString:@" FROM "];
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;
}
/* 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 {
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 {
if ([source isEqual:null] || (source == nil))
checkNull = YES;
- formattedLeft = [adaptor formatValue:source?source:null
+ formattedLeft = [adaptor formatValue:(source ? source : (id)null)
forAttribute:destination];
}
if ([destination isEqual:null] || (destination == nil))
checkNull = YES;
- formattedRight = [adaptor formatValue:destination?destination:null
+ formattedRight = [adaptor formatValue:(destination ? destination :(id)null)
forAttribute:source];
}
/* 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
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]];
@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) {
@end /* EOSelectSQLExpression */
+
@implementation EOSelectScannerHandler
- (id)init {
NSString *columnName;
columnName = (adaptor)
- ? [adaptor formatAttribute:self->attribute]
+ ? (NSString *)[adaptor formatAttribute:self->attribute]
: [self->attribute columnName];
if (alias)
$(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
# version file
-SUBMINOR_VERSION:=55
+SUBMINOR_VERSION:=56
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)"
+2006-07-04 Helge Hess <helge.hess@opengroupware.org>
+
+ * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.36)
+
2005-08-16 Helge Hess <helge.hess@opengroupware.org>
* GNUmakefile, GNUmakefile.preamble: added OSX framework compilation
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]];
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];
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;
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 */
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];
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;
- (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)
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];
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
+2006-07-04 Helge Hess <helge.hess@opengroupware.org>
+
+ * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.13)
+
2005-07-29 Helge Hess <helge.hess@skyrix.com>
* v4.5.12
}
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__,
#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;
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;
}
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];
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);
# Version file
-SUBMINOR_VERSION:=12
+SUBMINOR_VERSION:=13
+2006-07-04 Helge Hess <helge.hess@opengroupware.org>
+
+ * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.46)
+
2005-08-16 Helge Hess <helge.hess@opengroupware.org>
* GNUmakefile.preamble: added OSX framework compilation (v4.5.45)
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:@">"];
openConnectionCount++;
if (isDebuggingEnabled) {
- NSLog(@"PostgreSQL72 channel 0x%08X opened (connection=%@)",
+ NSLog(@"PostgreSQL72 channel 0x%p opened (connection=%@)",
(unsigned)self, self->connection);
}
return YES;
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;
}
if (isDebuggingEnabled)
- NSLog(@"PG0x%08X SQL: %@", (unsigned)self, _expression);
+ NSLog(@"PG0x%p SQL: %@", (unsigned)self, _expression);
[self _resetEvaluationState];
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
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 {
# version file
-SUBMINOR_VERSION:=45
+SUBMINOR_VERSION:=46
# v4.5.41 requires libGDLAccess v4.5.50
+2006-07-04 Helge Hess <helge.hess@opengroupware.org>
+
+ * use %p for pointer formats, fixed gcc 4.1 warnings (v4.5.21)
+
2005-08-16 Helge Hess <helge.hess@opengroupware.org>
* GNUmakefile.preamble: added OSX framework compilation (v4.5.20)
}
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__,
#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;
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;
}
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];
seq = ([seqName length] > 0)
? [NSString stringWithFormat:@"SELECT NEXTVAL ('%@')", seqName]
- : [adaptor newKeyExpression];
+ : (id)[adaptor newKeyExpression];
NS_DURING {
if ([self evaluateExpression:seq]) {
# Version file
-SUBMINOR_VERSION:=20
+SUBMINOR_VERSION:=21
# v4.5.17 requires libGDLAccess v4.5.50
projects / sope / commitdiff