gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-06-01 09:02:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bogus const declarations/casts

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@22945 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2006-05-20 09:56:49 +00:00
parent 192adaf6cd
commit 130716fd38
3 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Headers/Foundation/NSString.h
View file

@ -193,7 +193,7 @@ enum {
- (id) initWithBytes: (const void*)bytes - (id) initWithBytes: (const void*)bytes
length: (unsigned int)length length: (unsigned int)length
encoding: (NSStringEncoding)encoding; encoding: (NSStringEncoding)encoding;
- (id) initWithBytesNoCopy: (const void*)bytes - (id) initWithBytesNoCopy: (void*)bytes
length: (unsigned int)length length: (unsigned int)length
encoding: (NSStringEncoding)encoding encoding: (NSStringEncoding)encoding
freeWhenDone: (BOOL)flag; freeWhenDone: (BOOL)flag;

30
Source/GSString.m
View file

@ -463,7 +463,7 @@ fixBOM(unsigned char **bytes, unsigned *length, BOOL *shouldFree,
freeWhenDone: YES]; freeWhenDone: YES];
} }
- (id) initWithBytesNoCopy: (const void*)bytes - (id) initWithBytesNoCopy: (void*)bytes
length: (unsigned int)length length: (unsigned int)length
encoding: (NSStringEncoding)encoding encoding: (NSStringEncoding)encoding
freeWhenDone: (BOOL)flag freeWhenDone: (BOOL)flag
@ -478,7 +478,7 @@ fixBOM(unsigned char **bytes, unsigned *length, BOOL *shouldFree,
{ {
if (flag == YES && bytes != 0) if (flag == YES && bytes != 0)
{ {
NSZoneFree(NSZoneFromPointer((void*)bytes), (void*)bytes); NSZoneFree(NSZoneFromPointer(bytes), bytes);
} }
return nil; // Invalid encoding return nil; // Invalid encoding
} }
@ -606,7 +606,7 @@ fixBOM(unsigned char **bytes, unsigned *length, BOOL *shouldFree,
length: (unsigned)length length: (unsigned)length
freeWhenDone: (BOOL)flag freeWhenDone: (BOOL)flag
{ {
return [self initWithBytesNoCopy: (const void*)chars return [self initWithBytesNoCopy: (void*)chars
length: length * sizeof(unichar) length: length * sizeof(unichar)
encoding: NSUnicodeStringEncoding encoding: NSUnicodeStringEncoding
freeWhenDone: flag]; freeWhenDone: flag];
@ -624,7 +624,7 @@ fixBOM(unsigned char **bytes, unsigned *length, BOOL *shouldFree,
length: (unsigned)length length: (unsigned)length
freeWhenDone: (BOOL)flag freeWhenDone: (BOOL)flag
{ {
return [self initWithBytesNoCopy: (const void*)chars return [self initWithBytesNoCopy: (void*)chars
length: length length: length
encoding: externalEncoding encoding: externalEncoding
freeWhenDone: flag]; freeWhenDone: flag];
@ -2601,13 +2601,13 @@ transmute(GSStr self, NSString *aString)
memcpy(tmp, chars, length); memcpy(tmp, chars, length);
chars = tmp; chars = tmp;
} }
return [self initWithBytesNoCopy: chars return [self initWithBytesNoCopy: (void*)chars
length: length length: length
encoding: encoding encoding: encoding
freeWhenDone: YES]; freeWhenDone: YES];
} }
- (id) initWithBytesNoCopy: (const void*)chars - (id) initWithBytesNoCopy: (void*)chars
length: (unsigned int)length length: (unsigned int)length
encoding: (NSStringEncoding)encoding encoding: (NSStringEncoding)encoding
freeWhenDone: (BOOL)flag freeWhenDone: (BOOL)flag
@ -2621,7 +2621,7 @@ transmute(GSStr self, NSString *aString)
return nil; return nil;
} }
- (id) initWithCharacters: (unichar*)chars - (id) initWithCharacters: (const unichar*)chars
length: (unsigned int)length length: (unsigned int)length
{ {
return [self initWithBytes: chars return [self initWithBytes: chars
@ -2639,14 +2639,14 @@ transmute(GSStr self, NSString *aString)
freeWhenDone: flag]; freeWhenDone: flag];
} }
- (id) initWithCString: (char*)chars - (id) initWithCString: (const char*)chars
{ {
return [self initWithBytes: chars return [self initWithBytes: chars
length: strlen(chars) length: strlen(chars)
encoding: externalEncoding]; encoding: externalEncoding];
} }
- (id) initWithCString: (char*)chars - (id) initWithCString: (const char*)chars
encoding: (NSStringEncoding)encoding encoding: (NSStringEncoding)encoding
{ {
return [self initWithBytes: chars return [self initWithBytes: chars
@ -2654,7 +2654,7 @@ transmute(GSStr self, NSString *aString)
encoding: encoding]; encoding: encoding];
} }
- (id) initWithCString: (char*)chars - (id) initWithCString: (const char*)chars
length: (unsigned int)length length: (unsigned int)length
{ {
return [self initWithBytes: chars return [self initWithBytes: chars
@ -3731,21 +3731,17 @@ agree, create a new GSUnicodeInlineString otherwise.
} }
} }
- (id) initWithBytesNoCopy: (const void*)bytes - (id) initWithBytesNoCopy: (void*)bytes
length: (unsigned int)length length: (unsigned int)length
encoding: (NSStringEncoding)encoding encoding: (NSStringEncoding)encoding
freeWhenDone: (BOOL)flag freeWhenDone: (BOOL)flag
{ {
/*
* We can't use a 'const void*' as our buffer because we are going to
* modify it ... so we do a copy anyway and free the original if needed.
*/
self = [self initWithBytes: bytes self = [self initWithBytes: bytes
length: length length: length
encoding: encoding]; encoding: encoding];
if (flag == YES && bytes != 0) if (flag == YES && bytes != 0)
{ {
NSZoneFree(NSZoneFromPointer((void*)bytes), (void*)bytes); NSZoneFree(NSZoneFromPointer(bytes), bytes);
} }
return self; return self;
} }
@ -4636,7 +4632,7 @@ agree, create a new GSUnicodeInlineString otherwise.
*/ */
#define _self ((GSStr)self) #define _self ((GSStr)self)
- (id) initWithBytes: (void*)bytes - (id) initWithBytes: (const void*)bytes
length: (unsigned int)length length: (unsigned int)length
encoding: (NSStringEncoding)encoding encoding: (NSStringEncoding)encoding
{ {

4
Source/NSString.m
View file

@ -864,7 +864,7 @@ handle_printf_atsign (FILE *stream,
{ {
if (length == 0) if (length == 0)
{ {
return [self initWithBytesNoCopy: (const void *)0 return [self initWithBytesNoCopy: (void *)0
length: 0 length: 0
encoding: encoding encoding: encoding
freeWhenDone: NO]; freeWhenDone: NO];
@ -896,7 +896,7 @@ handle_printf_atsign (FILE *stream,
* In the GNUstep implementation, your subclasses may override * In the GNUstep implementation, your subclasses may override
* this initialiser in order to have all others function.</p> * this initialiser in order to have all others function.</p>
*/ */
- (id) initWithBytesNoCopy: (const void*)bytes - (id) initWithBytesNoCopy: (void*)bytes
length: (unsigned int)length length: (unsigned int)length
encoding: (NSStringEncoding)encoding encoding: (NSStringEncoding)encoding
freeWhenDone: (BOOL)flag freeWhenDone: (BOOL)flag