gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Corrected commit of wrong version

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@18506 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2004-01-30 11:20:07 +00:00
parent 94ac212556
commit 30bceb8753
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
Source/NSString.m
View file

@ -589,19 +589,18 @@ handle_printf_atsign (FILE *stream,
&& (encoding==_DefaultStringEncoding || encoding==NSASCIIStringEncoding))
{
self = [self initWithCString: bytes
length: length
freeWhenDone: YES];
length: length];
}
else if (encoding == NSUTF8StringEncoding)
{
unsigned i = 0;
unsigned char *b = (unsigned char*)bytes;
unsigned i = 0;
/*
* If the data begins with the UTF8 Byte Order Marker (as a
* signature for UTF8 data) we must remove it.
*/
if (length > 2
&& bytes[0] == 0xEF && bytes[1] == 0xBB && bytes[2] == 0xBF)
if (length > 2 && b[0] == 0xEF && b[1] == 0xBB && b[2] == 0xBF)
{
length -= 3;
bytes += 3;
@ -615,7 +614,7 @@ handle_printf_atsign (FILE *stream,
*/
while (i < length)
{
if ((bytes)[i] > 127)
if (b[i] > 127)
{
break;
}
@ -623,7 +622,7 @@ handle_printf_atsign (FILE *stream,
}
}
if (i == len)
if (i == length)
{
self = [self initWithCString: bytes length: length];
}
@ -685,7 +684,7 @@ handle_printf_atsign (FILE *stream,
{
unsigned i;
for (i = 0; i < len; i += 2)
for (i = 0; i < length; i += 2)
{
u[i] = b[i + 1];
u[i + 1] = b[i];
@ -693,7 +692,7 @@ handle_printf_atsign (FILE *stream,
}
else
{
memcpy(u, b, len);
memcpy(u, b, length);
}
self = [self initWithCharactersNoCopy: (unichar*)u
length: length/2
@ -755,21 +754,21 @@ handle_printf_atsign (FILE *stream,
else if (_ByteEncodingOk == YES
&& (encoding==_DefaultStringEncoding || encoding==NSASCIIStringEncoding))
{
self = [self initWithCStringNoCopy: bytes
self = [self initWithCStringNoCopy: (void*)bytes
length: length
freeWhenDone: YES];
bytesNeeded = YES;
}
else if (encoding == NSUTF8StringEncoding)
{
unsigned i = 0;
unsigned char *b =(unsigned char*)bytes;
unsigned i = 0;
/*
* If the data begins with the UTF8 Byte Order Marker (as a
* signature for UTF8 data) we must remove it.
*/
if (length > 2
&& bytes[0] == 0xEF && bytes[1] == 0xBB && bytes[2] == 0xBF)
if (length > 2 && b[0] == 0xEF && b[1] == 0xBB && b[2] == 0xBF)
{
length -= 3;
bytes += 3;
@ -783,7 +782,7 @@ handle_printf_atsign (FILE *stream,
*/
while (i < length)
{
if ((bytes)[i] > 127)
if (b[i] > 127)
{
break;
}
@ -791,7 +790,7 @@ handle_printf_atsign (FILE *stream,
}
}
if (i == len)
if (i == length)
{
self = [self initWithCString: bytes length: length];
}
@ -860,7 +859,7 @@ handle_printf_atsign (FILE *stream,
{
unsigned i;
for (i = 0; i < len; i += 2)
for (i = 0; i < length; i += 2)
{
u[i] = b[i + 1];
u[i + 1] = b[i];
@ -868,12 +867,12 @@ handle_printf_atsign (FILE *stream,
}
else
{
memcpy(u, b, len);
memcpy(u, b, length);
}
}
else
{
u = bytes;
u = (unsigned char *)bytes;
bytesNeeded = YES;
}
self = [self initWithCharactersNoCopy: (unichar*)u
@ -902,7 +901,7 @@ handle_printf_atsign (FILE *stream,
}
if (bytesNeeded == NO && bytes != 0)
{
NSZoneFree(NSDefaultMallocZone(), bytes);
NSZoneFree(NSZoneFromPointer((void*)bytes), (void*)bytes);
}
return self;
}