gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 08:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tweaks to avoid compiler warnings with gcc-4

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21390 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2005-07-01 12:29:50 +00:00
parent a7f1ff64f9
commit 71e5005964
53 changed files with 502 additions and 322 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Source/NSString.m
View file

@ -89,8 +89,16 @@ extern BOOL GSScanDouble(unichar*, unsigned, double*);
@class GSString;
@class GSMutableString;
@class GSPlaceholderString;
@interface GSPlaceholderString : NSObject // Help the compiler
@end
@class GSMutableArray;
@class GSMutableDictionary;
@class NSImmutableString;
@interface NSImmutableString : NSObject // Help the compiler
@end
@class GSImmutableString;
@interface GSImmutableString : NSObject // Help the compiler
@end
/*
@ -1144,8 +1152,8 @@ handle_printf_atsign (FILE *stream,
unichar *buf = 0;
unsigned int l = 0;
if (GSToUnicode(&buf, &l, byteString, length, _DefaultStringEncoding,
[self zone], 0) == NO)
if (GSToUnicode(&buf, &l, (unsigned char*)byteString, length,
_DefaultStringEncoding, [self zone], 0) == NO)
{
DESTROY(self);
}
@ -1279,8 +1287,8 @@ handle_printf_atsign (FILE *stream,
unichar *u = 0;
unsigned int l = 0;
if (GSToUnicode(&u, &l, bytes, length, NSUTF8StringEncoding,
GSObjCZone(self), 0) == NO)
if (GSToUnicode(&u, &l, (unsigned char*)bytes, length,
NSUTF8StringEncoding, GSObjCZone(self), 0) == NO)
{
DESTROY(self);
}
@ -1396,7 +1404,7 @@ handle_printf_atsign (FILE *stream,
}
else
{
self = [self initWithCString: f._contents.c length: f._count];
self = [self initWithCString: (char*)f._contents.c length: f._count];
}
/*
@ -1475,7 +1483,7 @@ handle_printf_atsign (FILE *stream,
if (i == len)
{
self = [self initWithCString: bytes length: len];
self = [self initWithCString: (char*)bytes length: len];
}
else
{
@ -3340,7 +3348,7 @@ handle_printf_atsign (FILE *stream,
else
{
unsigned char *b = 0;
int l = 0;
unsigned l = 0;
unichar *u;
u = (unichar*)NSZoneMalloc(NSDefaultMallocZone(), len*sizeof(unichar));
@ -4862,7 +4870,7 @@ static NSFileManager *fm = nil;
else if (enc == NSASCIIStringEncoding
|| enc == _DefaultStringEncoding)
{
unsigned char *chars;
char *chars;
chars = NSZoneMalloc(zone, count+1);
[aCoder decodeArrayOfObjCType: @encode(unsigned char)
@ -4881,7 +4889,7 @@ static NSFileManager *fm = nil;
count: count
at: chars];
chars[count] = '\0';
self = [self initWithUTF8String: chars];
self = [self initWithUTF8String: (char*)chars];
NSZoneFree(zone, chars);
}
else
@ -5041,7 +5049,7 @@ static NSFileManager *fm = nil;
/**
* Constructs an empty string.
*/
+ (NSMutableString*) string
+ (id) string
{
return AUTORELEASE([[GSMutableStringClass allocWithZone:
NSDefaultMallocZone()] initWithCapacity: 0]);
@ -5060,8 +5068,8 @@ static NSFileManager *fm = nil;
* Create a string of unicode characters.
*/
// Inefficient implementation.
+ (NSString*) stringWithCharacters: (const unichar*)characters
length: (unsigned int)length
+ (id) stringWithCharacters: (const unichar*)characters
length: (unsigned int)length
{
return AUTORELEASE([[GSMutableStringClass allocWithZone:
NSDefaultMallocZone()] initWithCharacters: characters length: length]);
@ -5083,7 +5091,7 @@ static NSFileManager *fm = nil;
* null-terminated and encoded in the default C string encoding. (Characters
* will be converted to unicode representation internally.)
*/
+ (NSString*) stringWithCString: (const char*)byteString
+ (id) stringWithCString: (const char*)byteString
{
return AUTORELEASE([[GSMutableStringClass allocWithZone:
NSDefaultMallocZone()] initWithCString: byteString]);
@ -5094,8 +5102,8 @@ static NSFileManager *fm = nil;
* null bytes and should be encoded in the default C string encoding.
* (Characters will be converted to unicode representation internally.)
*/
+ (NSString*) stringWithCString: (const char*)byteString
length: (unsigned int)length
+ (id) stringWithCString: (const char*)byteString
length: (unsigned int)length
{
return AUTORELEASE([[GSMutableStringClass allocWithZone:
NSDefaultMallocZone()] initWithCString: byteString length: length]);
@ -5106,7 +5114,7 @@ static NSFileManager *fm = nil;
* be a constant format string, like '<code>@"float val = %f"</code>', remaining
* arguments should be the variables to print the values of, comma-separated.
*/
+ (NSString*) stringWithFormat: (NSString*)format, ...
+ (id) stringWithFormat: (NSString*)format, ...
{
va_list ap;
va_start(ap, format);
@ -5305,8 +5313,6 @@ static NSFileManager *fm = nil;
* The methods in this category are not available in MacOS-X
*/
@implementation NSMutableString (GNUstep)
@class NSImmutableString;
@class GSImmutableString;
/**
* Returns a proxy to the receiver which will allow access to the