mirror of
https://github.com/gnustep/libs-base.git
synced 2025-06-01 09:02:01 +00:00
Fix deadlock and revert previous change
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@26603 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
220bf8f040
commit
62564278d7
7 changed files with 43 additions and 25 deletions
|
@ -4384,9 +4384,7 @@ static NSFileManager *fm = nil;
|
|||
else
|
||||
{
|
||||
ret = AUTORELEASE([[self allocWithZone: NSDefaultMallocZone()]
|
||||
initWithFormat: format locale:
|
||||
[[NSUserDefaults standardUserDefaults] dictionaryRepresentation]
|
||||
arguments: ap]);
|
||||
initWithFormat: format locale: GSPrivateDefaultLocale() arguments: ap]);
|
||||
}
|
||||
va_end(ap);
|
||||
return ret;
|
||||
|
@ -4439,8 +4437,7 @@ static NSFileManager *fm = nil;
|
|||
return [self compare: string
|
||||
options: 0
|
||||
range: ((NSRange){0, [self length]})
|
||||
locale:
|
||||
[[NSUserDefaults standardUserDefaults] dictionaryRepresentation]];
|
||||
locale: GSPrivateDefaultLocale()];
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -4452,8 +4449,7 @@ static NSFileManager *fm = nil;
|
|||
return [self compare: string
|
||||
options: NSCaseInsensitiveSearch
|
||||
range: ((NSRange){0, [self length]})
|
||||
locale:
|
||||
[[NSUserDefaults standardUserDefaults] dictionaryRepresentation]];
|
||||
locale: GSPrivateDefaultLocale()];
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue