fixed gcc 4.0 warnings

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

diff --git a/sope-ldap/NGLdap/ChangeLog b/sope-ldap/NGLdap/ChangeLog
index e7dba7ebf19135ba095a7d1d0676020d9860402f..88926e93bc7a9f83c90675cd66d8f82ec6204ab7 100644 (file)
--- a/sope-ldap/NGLdap/ChangeLog
+++ b/sope-ldap/NGLdap/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-25  Helge Hess  <helge.hess@opengroupware.org>
+
+       * fixed gcc 4.0 warnings (v4.5.23)
+
 2005-03-08  Helge Hess  <helge.hess@opengroupware.org>
 
        * NGLdapConnection.m: fixed not to do unauthenticated binds (related to

diff --git a/sope-ldap/NGLdap/NGLdapAttribute.m b/sope-ldap/NGLdap/NGLdapAttribute.m
index 4cbd3cfda39dacfa45e5a91473b338b494450d16..2fa4cf1228a0d3caf8f180b3957b153c89814f8b 100644 (file)
--- a/sope-ldap/NGLdap/NGLdapAttribute.m
+++ b/sope-ldap/NGLdap/NGLdapAttribute.m
@@ -104,7 +104,7 @@
   return [self->values count];
 }
 
-- (void)addValue:(id)_value {
+- (void)addValue:(NSData *)_value {
   self->didChange = YES;
   
   if (self->values == nil)

diff --git a/sope-ldap/NGLdap/NGLdapURL.m b/sope-ldap/NGLdap/NGLdapURL.m
index c989e765a47e1a3d6006f7f00b737c36c648cfcc..014bbe5a6c40f4046348c256eb53308f737717c4 100644 (file)
--- a/sope-ldap/NGLdap/NGLdapURL.m
+++ b/sope-ldap/NGLdap/NGLdapURL.m
@@ -113,7 +113,7 @@ static void NGEscapeUrlBuffer
     } 
     else { // any other char is escaped ..
       *_dest = '%'; _dest++;
-      sprintf(_dest, "%02X", (unsigned)*src);
+      sprintf((char *)_dest, "%02X", (unsigned)*src);
       _dest += 2;
     }
     src++;
@@ -128,15 +128,16 @@ static NSString *NGEscapeUrlString(NSString *_source) {
   if ((len = [_source cStringLength]) == 0)
     return _source;
 
-  cstr = malloc(len + 1);
+  cstr = malloc(len + 3);
   [_source getCString:cstr];
   cstr[len] = '\0';
   
-  if (NGContainsUrlInvalidCharacters(cstr)) { // needs to be escaped ?
+  if (NGContainsUrlInvalidCharacters((unsigned char *)cstr)) {
+    // needs to be escaped ?
     char *buffer = NULL;
     
     buffer = NGMallocAtomic([_source cStringLength] * 3 + 2);
-    NGEscapeUrlBuffer(cstr, buffer);
+    NGEscapeUrlBuffer((unsigned char *)cstr, (unsigned char *)buffer);
     
     s = [[[NSString alloc]
                     initWithCStringNoCopy:buffer

diff --git a/sope-ldap/NGLdap/Version b/sope-ldap/NGLdap/Version
index 4aced839c96b6e01b8f67c6c66a401f646205305..9b70b74294527318faea33ac44844ae85d7a7a16 100644 (file)
--- a/sope-ldap/NGLdap/Version
+++ b/sope-ldap/NGLdap/Version
@@ -2,4 +2,4 @@
 
 MAJOR_VERSION=4
 MINOR_VERSION=5
-SUBMINOR_VERSION:=22
+SUBMINOR_VERSION:=23