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

* Source/NSString.m: Small cleanup for printf registration.

Browse source
This commit is contained in:
fredkiefer 2018-06-28 23:04:45 +02:00
parent ea95ff1f59
commit 3b63a0d1f4
2 changed files with 30 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2018-06-28 Fred Kiefer <fredkiefer@gmx.de>
* Source/NSString.m: Small cleanup for printf registration.
2018-06-28 Richard Frith-Macdonald <rfm@gnu.org>
* Source/NSXMLParser.m: Fix conversion of numeric entities with large

48
Source/NSString.m
View file

@ -621,6 +621,31 @@ handle_printf_atsign (FILE *stream,
}
#endif /* HAVE_REGISTER_PRINTF_FUNCTION */
static void
register_printf_atsign ()
{
#if defined(HAVE_REGISTER_PRINTF_SPECIFIER)
if (register_printf_specifier ('@', handle_printf_atsign,
#if PRINTF_ATSIGN_VA_LIST
0))
#else
arginfo_func))
#endif
[NSException raise: NSGenericException
format: @"register printf handling of %%@ failed"];
#elif defined(HAVE_REGISTER_PRINTF_FUNCTION)
if (register_printf_function ('@', handle_printf_atsign,
#if PRINTF_ATSIGN_VA_LIST
0))
#else
arginfo_func))
#endif
[NSException raise: NSGenericException
format: @"register printf handling of %%@ failed"];
#endif
}
#if GS_USE_ICU == 1
/**
* Returns an ICU collator for the given locale and options, or returns
@ -822,26 +847,7 @@ GSICUCollatorOpen(NSStringCompareOptions mask, NSLocale *locale)
[GSPlaceholderStringClass allocWithZone: NSDefaultMallocZone()];
placeholderMap = NSCreateMapTable(NSNonOwnedPointerMapKeyCallBacks,
NSNonRetainedObjectMapValueCallBacks, 0);
#if defined(HAVE_REGISTER_PRINTF_SPECIFIER)
if (register_printf_specifier ('@', handle_printf_atsign,
#if PRINTF_ATSIGN_VA_LIST
0))
#else
arginfo_func))
#endif
[NSException raise: NSGenericException
format: @"register printf handling of %%@ failed"];
#elif defined(HAVE_REGISTER_PRINTF_FUNCTION)
if (register_printf_function ('@', handle_printf_atsign,
#if PRINTF_ATSIGN_VA_LIST
0))
#else
arginfo_func))
#endif
[NSException raise: NSGenericException
format: @"register printf handling of %%@ failed"];
#endif
register_printf_atsign();
[self registerAtExit];
}
}
@ -1424,13 +1430,11 @@ GSICUCollatorOpen(NSStringCompareOptions mask, NSLocale *locale)
* 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];
}