improved Tiger support in bundle manager

[sope] / sope-core / NGExtensions / NGExtensions / NGCharBuffers.h

diff --git a/sope-core/NGExtensions/NGExtensions/NGCharBuffers.h b/sope-core/NGExtensions/NGExtensions/NGCharBuffers.h
index 84732431dba261dafeed32708d1e5feaa55a8c23..dc5ceaafb8147b6b7dc319ae7cf03d384304f156 100644 (file)
--- a/sope-core/NGExtensions/NGExtensions/NGCharBuffers.h
+++ b/sope-core/NGExtensions/NGExtensions/NGCharBuffers.h
@@ -66,7 +66,7 @@ static inline NGCharBuffer8 NGCharBuffer8_newWithCString(const char *_cstr) {
   NGCharBuffer8 str = NULL;
   str = NGMalloc(sizeof(NGCharBuffer8Struct));
   str = NGCharBuffer8_init(str, strlen(_cstr) + 2);
-  strcpy(str->buffer, _cstr);
+  strcpy((char *)str->buffer, _cstr);
   return str;
 }
 
@@ -111,7 +111,7 @@ static inline void NGCharBuffer8_addCString(NGCharBuffer8 _str, char *_cstr) {
 
   len = strlen(_cstr);
   NGCharBuffer8_checkCapacity(_str, len);
-  strcat(_str->buffer, _cstr);
+  strcat((char *)_str->buffer, _cstr);
   _str->length += len;
 }
 
@@ -120,20 +120,19 @@ static inline void NGCharBuffer8_removeContents(NGCharBuffer8 _str) {
   _str->buffer[0] = '\0';
 }
 
-static inline NSString *NGCharBuffer8_makeStringAndDealloc(NGCharBuffer8 _str) {
-  if (_str == NULL) {
+static inline NSString *NGCharBuffer8_makeStringAndDealloc(NGCharBuffer8 _str){
+  NSString *str;
+  
+  if (_str == NULL)
     return nil;
-  }
-  else {
-    NSString *str = [NSString stringWithCString:_str->buffer length:_str->length];
 
-    NSCAssert3(strlen(_str->buffer) == _str->length,
-               @"length of cstring(%s) and the buffer do not match (%i vs %i)",
-               _str->buffer, strlen(_str->buffer), _str->length);
+  str = [NSString stringWithCString:(char *)_str->buffer length:_str->length];
+  NSCAssert3(strlen((char *)_str->buffer) == _str->length,
+            @"length of cstring(%s) and the buffer do not match (%i vs %i)",
+            _str->buffer, strlen((char *)_str->buffer), _str->length);
 
-    NGCharBuffer8_dealloc(_str); _str = NULL;
-    return str;
-  }
+  NGCharBuffer8_dealloc(_str); _str = NULL;
+  return str;
 }
 
 static inline void NGCharBuffer8_stripTrailingSpaces(NGCharBuffer8 _str) {