mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-29 16:01:38 +00:00
Fixes from Jeremy Bettis
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21535 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
37df5e2822
commit
b418f0eb9b
5 changed files with 22 additions and 22 deletions
|
@ -1787,31 +1787,14 @@ NSDictionary *locale)
|
|||
}
|
||||
else
|
||||
{
|
||||
/* This is complicated. We have to transform the wide
|
||||
string into a unicode string. */
|
||||
/* This is simple. Wide string == unicode string. */
|
||||
int prc;
|
||||
unichar *sp;
|
||||
wchar_t *wsp;
|
||||
unichar *wsp;
|
||||
|
||||
len = 0;
|
||||
prc = prec;
|
||||
wsp = (wchar_t *)string;
|
||||
wsp = (unichar *)string;
|
||||
while (prc-- && *wsp++) len++;
|
||||
|
||||
wsp = (wchar_t *)string;
|
||||
|
||||
/* Allocate dynamically an array which definitely is long
|
||||
enough for the wide character version. */
|
||||
if (len < 8192
|
||||
|| ((string = (unichar *) NSZoneMalloc(s->_zone, len * sizeof (unichar)))
|
||||
== NULL))
|
||||
string = (unichar *) alloca (len * sizeof (unichar));
|
||||
else
|
||||
string_malloced = 1;
|
||||
|
||||
prc = len;
|
||||
sp = string;
|
||||
while (prc--) *sp = *wsp;
|
||||
}
|
||||
|
||||
if ((width -= len) <= 0)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue