gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-20 12:16:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug #19587

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@25057 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2007-04-15 13:20:34 +00:00
parent 06d1115491
commit b6f5848178
6 changed files with 168 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/NSString.m
View file

@ -515,6 +515,8 @@ handle_printf_atsign (FILE *stream,
string_object = *((id*) ptr);
#endif
string_object = [string_object description];
#if HAVE_WIDE_PRINTF_FUNCTION
if (info->wide)
{
if (sizeof(wchar_t) == 4)
@ -539,6 +541,7 @@ handle_printf_atsign (FILE *stream,
}
}
else
#endif /* HAVE_WIDE_PRINTF_FUNCTION */
{
len = fprintf(stream, "%*s",
(info->left ? - info->width : info->width),
@ -1084,7 +1087,9 @@ handle_printf_atsign (FILE *stream,
f._contents.c = buf;
f._capacity = sizeof(buf);
f._count = 0;
#if HAVE_WIDE_PRINTF_FUNCTION
f._flags.wide = 0;
#endif /* HAVE_WIDE_PRINTF_FUNCTION */
f._flags.free = 0;
GSPrivateFormat(&f, fmt, argList, locale);
GSPrivateStrExternalize(&f);
@ -1101,11 +1106,13 @@ handle_printf_atsign (FILE *stream,
* the temporary buffer) for large strings. For most strings, the
* on-stack memory will have been used, so we will get better performance.
*/
#if HAVE_WIDE_PRINTF_FUNCTION
if (f._flags.wide == 1)
{
self = [self initWithCharacters: f._contents.u length: f._count];
}
else
#endif /* HAVE_WIDE_PRINTF_FUNCTION */
{
self = [self initWithCString: (char*)f._contents.c length: f._count];
}