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

Minor tidyups

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@13389 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
CaS 2002-04-07 16:54:35 +00:00
parent 2f38502a1e
commit 0ac845ddd5
2 changed files with 58 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -4,6 +4,7 @@
Write plist unicode escapes using the conventional \u rather than \U,
but read in either form.
* Source/GSString.m: Fix error in length of unicode data produced.
Tidy initilisers.
* Tools/cvtenc.m: Made easy to use and added instructions.
Sat Apr 6 02:42:43 2002 Nicola Pero <n.pero@mi.flashnet.it>

73
Source/GSString.m
View file

@ -353,7 +353,9 @@ setup()
me->_count = length;
me->_flags.wide = 1;
if (flag == YES)
me->_flags.free = 1;
{
me->_flags.free = 1;
}
return (id)me;
}
@ -363,14 +365,29 @@ setup()
- (id) initWithCString: (const char*)chars
length: (unsigned)length
{
ivars me;
if (defEnc == intEnc)
{
ivars me;
me = (ivars)NSAllocateObject(GSCInlineStringClass, length, GSObjCZone(self));
me->_contents.c = (char*)&((GSCInlineString*)me)[1];
me->_count = length;
me->_flags.wide = 0;
memcpy(me->_contents.c, chars, length);
return (id)me;
me = (ivars)NSAllocateObject(GSCInlineStringClass, length,
GSObjCZone(self));
me->_contents.c = (char*)&((GSCInlineString*)me)[1];
me->_count = length;
me->_flags.wide = 0;
memcpy(me->_contents.c, chars, length);
return (id)me;
}
else
{
unichar *u = 0;
unsigned l = 0;
if (GSToUnicode(&u, &l, chars, length, defEnc, GSObjCZone(self), 0) == NO)
{
return nil;
}
return [self initWithCharactersNoCopy: u length: l freeWhenDone: YES];
}
}
/*
@ -380,15 +397,39 @@ setup()
length: (unsigned)length
freeWhenDone: (BOOL)flag
{
ivars me;
if (defEnc == intEnc)
{
ivars me;
me = (ivars)NSAllocateObject(GSCStringClass, 0, GSObjCZone(self));
me->_contents.c = chars;
me->_count = length;
me->_flags.wide = 0;
if (flag == YES)
me->_flags.free = 1;
return (id)me;
me = (ivars)NSAllocateObject(GSCStringClass, 0, GSObjCZone(self));
me->_contents.c = chars;
me->_count = length;
me->_flags.wide = 0;
if (flag == YES)
{
me->_flags.free = 1;
}
return (id)me;
}
else
{
unichar *u = 0;
unsigned l = 0;
if (GSToUnicode(&u, &l, chars, length, defEnc, GSObjCZone(self), 0) == NO)
{
self = nil;
}
else
{
self = [self initWithCharactersNoCopy: u length: l freeWhenDone: YES];
}
if (flag == YES)
{
NSZoneFree(NSZoneFromPointer(chars), chars);
}
return self;
}
}
/*