system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Restore the __collate_load_error global that was accidentally removed in the

Browse source 
xlocale refactoring.

MFC after:	1 week
This commit is contained in:
David Chisnall 2012-07-06 20:16:22 +00:00
parent 9775776ce2
commit bb4317bf3c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=238182
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/libc/locale/collate.c
View file

@ -56,11 +56,11 @@ __FBSDID("$FreeBSD$");
* We also modify the collation table test functions to search the thread-local
* table first and the global table second.
*/
#define __collate_load_error (table->__collate_load_error)
#define __collate_substitute_nontrivial (table->__collate_substitute_nontrivial)
#define __collate_substitute_table_ptr (table->__collate_substitute_table_ptr)
#define __collate_char_pri_table_ptr (table->__collate_char_pri_table_ptr)
#define __collate_chain_pri_table (table->__collate_chain_pri_table)
int __collate_load_error;
struct xlocale_collate __xlocale_global_collate = {
@ -109,7 +109,9 @@ __collate_load(const char *encoding, locale_t unused)
int
__collate_load_tables(const char *encoding)
{
return __collate_load_tables_l(encoding, &__xlocale_global_collate);
int ret = __collate_load_tables_l(encoding, &__xlocale_global_collate);
__collate_load_error = __xlocale_global_collate.__collate_load_error;
return ret;
}
int
@ -123,7 +125,7 @@ __collate_load_tables_l(const char *encoding, struct xlocale_collate *table)
/* 'encoding' must be already checked. */
if (strcmp(encoding, "C") == 0 || strcmp(encoding, "POSIX") == 0) {
__collate_load_error = 1;
table->__collate_load_error = 1;
return (_LDP_CACHE);
}
@ -240,7 +242,7 @@ __collate_load_tables_l(const char *encoding, struct xlocale_collate *table)
break;
}
}
__collate_load_error = 0;
table->__collate_load_error = 0;
return (_LDP_LOADED);
}

1
lib/libc/locale/setrunelocale.c
View file

@ -67,7 +67,6 @@ extern _RuneLocale *_Read_RuneMagi(FILE *);
static int __setrunelocale(struct xlocale_ctype *l, const char *);
#define __collate_load_error (table->__collate_load_error)
#define __collate_substitute_nontrivial (table->__collate_substitute_nontrivial)
#define __collate_substitute_table_ptr (table->__collate_substitute_table_ptr)
#define __collate_char_pri_table_ptr (table->__collate_char_pri_table_ptr)