From a1415649816d734e83fdcca79fa6f8f2ffc08972 Mon Sep 17 00:00:00 2001 From: helge Date: Mon, 2 May 2005 22:21:40 +0000 Subject: [PATCH] fixed gcc 4.0 warnings git-svn-id: http://svn.opengroupware.org/SOPE/trunk@780 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-xml/XmlRpc/ChangeLog | 5 +++++ sope-xml/XmlRpc/NSObject+XmlRpc.m | 12 ++++++------ sope-xml/XmlRpc/Version | 2 +- sope-xml/XmlRpc/XmlRpcSaxHandler.m | 9 ++++++--- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/sope-xml/XmlRpc/ChangeLog b/sope-xml/XmlRpc/ChangeLog index 58207c2a..c6628b91 100644 --- a/sope-xml/XmlRpc/ChangeLog +++ b/sope-xml/XmlRpc/ChangeLog @@ -1,3 +1,8 @@ +2005-05-03 Helge Hess + + * NSObject+XmlRpc.m, XmlRpcSaxHandler.m: fixed gcc 4.0 warnings + (v4.5.25) + 2005-04-26 Helge Hess * XmlRpcDecoder.m: fixed duplicate decoding of base64 values in XML-RPC diff --git a/sope-xml/XmlRpc/NSObject+XmlRpc.m b/sope-xml/XmlRpc/NSObject+XmlRpc.m index f2157e24..f5cc35fc 100644 --- a/sope-xml/XmlRpc/NSObject+XmlRpc.m +++ b/sope-xml/XmlRpc/NSObject+XmlRpc.m @@ -227,18 +227,18 @@ buf[0] = _chars[0]; buf[1] = _chars[1]; buf[2] = _chars[2]; buf[3] = _chars[3]; buf[4] = '\0'; - year = atoi(buf); + year = atoi((char *)buf); buf[0] = _chars[4]; buf[1] = _chars[5]; buf[2] = '\0'; - month = atoi(buf); + month = atoi((char *)buf); buf[0] = _chars[6]; buf[1] = _chars[7]; buf[2] = '\0'; - day = atoi(buf); + day = atoi((char *)buf); buf[0] = _chars[9]; buf[1] = _chars[10]; buf[2] = '\0'; - hour = atoi(buf); + hour = atoi((char *)buf); buf[0] = _chars[12]; buf[1] = _chars[13]; buf[2] = '\0'; - min = atoi(buf); + min = atoi((char *)buf); buf[0] = _chars[15]; buf[1] = _chars[16]; buf[2] = '\0'; - sec = atoi(buf); + sec = atoi((char *)buf); if (year > 2033) { NSString *s; diff --git a/sope-xml/XmlRpc/Version b/sope-xml/XmlRpc/Version index 483f71f6..67ebc1c5 100644 --- a/sope-xml/XmlRpc/Version +++ b/sope-xml/XmlRpc/Version @@ -1,3 +1,3 @@ # version file -SUBMINOR_VERSION:=24 +SUBMINOR_VERSION:=25 diff --git a/sope-xml/XmlRpc/XmlRpcSaxHandler.m b/sope-xml/XmlRpc/XmlRpcSaxHandler.m index ea05fe07..9bb863fd 100644 --- a/sope-xml/XmlRpc/XmlRpcSaxHandler.m +++ b/sope-xml/XmlRpc/XmlRpcSaxHandler.m @@ -343,7 +343,9 @@ static BOOL doDebug = NO; } - (void)end_member { - id tmp = [[self->valueStack lastObject] value]; + id tmp; // TODO: can't we type the var? + + tmp = [[self->valueStack lastObject] value]; if ([self->memberNameStack count] != [self->memberValueStack count]) { NSLog(@"Warning(%s): memberNameStack.count != memberValueStack.count" @@ -367,8 +369,9 @@ static BOOL doDebug = NO; else if (![tmp isKindOfClass:DictionaryClass]) self->invalidCall = YES; else { - [tmp setObject:[self->memberValueStack lastObject] - forKey:[self->memberNameStack lastObject]]; + [(NSMutableDictionary *)tmp + setObject:[self->memberValueStack lastObject] + forKey:[self->memberNameStack lastObject]]; [self->memberNameStack removeLastObject]; [self->memberValueStack removeLastObject]; -- 2.39.5