From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Sun, 21 May 2006 21:02:54 +0000 (+0000)
Subject: Some compilation fixups.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec576fce7f32d4479dced646f66f3f7f9d91a8eb;p=sope

Some compilation fixups.


git-svn-id: http://svn.opengroupware.org/SOPE/trunk@1265 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/Recycler/SxComponents/ChangeLog b/Recycler/SxComponents/ChangeLog
index dc73cdd6..eafd5255 100644
--- a/Recycler/SxComponents/ChangeLog
+++ b/Recycler/SxComponents/ChangeLog
@@ -1,3 +1,7 @@
+2006-05-20  Helge Hess  <helge.hess@opengroupware.org>
+
+	* fixed some gcc 4.1 warnings (v4.5.30)
+
 2005-03-23  Helge Hess  <helge.hess@skyrix.com>
 
 	* added FHS and config.make support, fixed compilation (v4.5.29)
diff --git a/Recycler/SxComponents/SxXmlRpcComponent.m b/Recycler/SxComponents/SxXmlRpcComponent.m
index f4e3f76b..5ae6f5e6 100644
--- a/Recycler/SxComponents/SxXmlRpcComponent.m
+++ b/Recycler/SxComponents/SxXmlRpcComponent.m
@@ -157,7 +157,7 @@
     return nil;
   
   if ((signatures = [self->signatureCache objectForKey:_method]))
-    return [signatures isNotNull] ? signatures : nil;
+    return [signatures isNotNull] ? signatures : (NSArray *)nil;
 
   fqMethodName = [self fqMethodNameForMethod:_method];
 
@@ -208,7 +208,7 @@
     self->signatureCache = [[NSMutableDictionary alloc] initWithCapacity:32];
   
   [self->signatureCache
-       setObject:result?result:(id)[NSNull null]
+       setObject:(result ? result : (NSMutableArray *)[NSNull null])
        forKey:_method];
   
   return result;
diff --git a/Recycler/SxComponents/SxXmlRpcInvocation.m b/Recycler/SxComponents/SxXmlRpcInvocation.m
index 226584a0..ddfff61f 100644
--- a/Recycler/SxComponents/SxXmlRpcInvocation.m
+++ b/Recycler/SxComponents/SxXmlRpcInvocation.m
@@ -130,7 +130,7 @@
     
     data = [self content];
     if ([data length] > 32) {
-      const unsigned char *bytes = [data bytes];
+      const char *bytes = [data bytes];
       if (strncmp("<methodResponse>", bytes, 16) != 0)
         return YES;
     }
@@ -194,10 +194,10 @@ static NSNull *null = nil;
         
       value = [self->arguments objectAtIndex:i];
       value = [value asXmlRpcValueOfType:xrtype];
-      aa[i] = value ? value : null;
+      aa[i] = value ? value : (id)null;
     }
     args = [NSArray arrayWithObjects:aa count:count];
-    if (aa) free(aa);
+    if (aa != NULL) free(aa);
   }
   else
     args = self->arguments;
diff --git a/Recycler/SxComponents/Version b/Recycler/SxComponents/Version
index 5afe0dc2..af4c8288 100644
--- a/Recycler/SxComponents/Version
+++ b/Recycler/SxComponents/Version
@@ -1,3 +1,3 @@
 # Version
 
-SUBMINOR_VERSION:=29
+SUBMINOR_VERSION:=30