gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-30 00:11:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for issue 459

Browse source
This commit is contained in:
rfm 2024-11-08 10:10:20 +00:00
parent 7cc1c72ac6
commit f180575e37
1 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

54
Source/NSString.m
View file

@ -609,7 +609,8 @@ _GSICUCollatorCreate(NSStringCompareOptions mask, const char *localeCString)
return self;
}
- (void) dealloc {
- (void) dealloc
{
RELEASE(locale);
if (collator != NULL)
{
@ -630,33 +631,37 @@ _GSICUCollatorCreate(NSStringCompareOptions mask, const char *localeCString)
static UCollator *
GSICUCachedCollator(NSStringCompareOptions mask, NSLocale *locale)
{
NSThread *current;
GSICUCollatorCache *cache;
NSThread *current;
GSICUCollatorCache *cache;
current = [NSThread currentThread];
cache = [current _stringCollatorCache];
if (nil == cache) {
cache = [[GSICUCollatorCache alloc] initWithMask: mask locale: locale];
[current _setStringCollatorCache: cache];
[cache release];
return cache->collator;
}
// Do a pointer comparison first to avoid the overhead of isEqual:
// The locale instance is likely a global constant object.
// If this fails, do a full comparison.
if ((cache->locale == locale || [cache->locale isEqual: locale]) && mask == cache->mask)
if (nil == cache)
{
return cache->collator;
}
else
{
cache = [[GSICUCollatorCache alloc] initWithMask: mask locale: locale];
[current _setStringCollatorCache: cache];
[cache release];
return cache->collator;
}
}
/* Do a pointer comparison first to avoid the overhead of isEqual:
* The locale instance is likely a global constant object.
* If this fails, do a full comparison.
*/
if ((cache->locale == locale || [cache->locale isEqual: locale])
&& mask == cache->mask)
{
return cache->collator;
}
else
{
cache = [[GSICUCollatorCache alloc] initWithMask: mask locale: locale];
[current _setStringCollatorCache: cache];
[cache release];
return cache->collator;
}
}
#endif // GS_USE_ICU
@implementation NSString
@ -772,7 +777,7 @@ register_printf_atsign ()
0))
#else
arginfo_func))
#endif
#endif // PRINTF_ATSIGN_VA_LIST
[NSException raise: NSGenericException
format: @"register printf handling of %%@ failed"];
#elif defined(HAVE_REGISTER_PRINTF_FUNCTION)
@ -781,10 +786,10 @@ register_printf_atsign ()
0))
#else
arginfo_func))
#endif
#endif // PRINTF_ATSIGN_VA_LIST
[NSException raise: NSGenericException
format: @"register printf handling of %%@ failed"];
#endif
#endif // defined(HAVE_REGISTER_PRINTF_FUNCTION)
}
@ -872,7 +877,6 @@ register_printf_atsign ()
return AUTORELEASE(newString);
}
#endif
#endif
+ (void) atExit
{
@ -6393,14 +6397,12 @@ static NSFileManager *fm = nil;
uint8_t substringType;
BOOL isReverse;
BOOL substringNotRequired;
BOOL localized;
NSUInteger currentLocation;
BOOL stop = NO;
substringType = opts & 0xFF;
isReverse = opts & NSStringEnumerationReverse;
substringNotRequired = opts & NSStringEnumerationSubstringNotRequired;
localized = opts & NSStringEnumerationLocalized;
if (isReverse)
{
@ -6511,7 +6513,7 @@ static NSFileManager *fm = nil;
/* @ss=standard will use lists of common abbreviations,
* such as Mr., Mrs., etc.
*/
locale = localized
locale = (opts & NSStringEnumerationLocalized)
? [[[[NSLocale currentLocale] localeIdentifier]
stringByAppendingString: @"@ss=standard"] UTF8String]
: "en_US_POSIX";