diff options
Diffstat (limited to 'intl/finddomain.c')
| -rw-r--r-- | intl/finddomain.c | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/intl/finddomain.c b/intl/finddomain.c index d487bbdf42..e0e11f0b7e 100644 --- a/intl/finddomain.c +++ b/intl/finddomain.c @@ -1,5 +1,5 @@ /* Handle list of needed message catalogs - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Ulrich Drepper <drepper@gnu.org>, 1995. @@ -60,9 +60,6 @@ _nl_find_domain (dirname, locale, domainname, domainbinding) const char *territory; const char *codeset; const char *normalized_codeset; - const char *special; - const char *sponsor; - const char *revision; const char *alias_value; int mask; @@ -70,28 +67,21 @@ _nl_find_domain (dirname, locale, domainname, domainbinding) language[_territory[.codeset]][@modifier] - and six parts for the CEN syntax: - - language[_territory][+audience][+special][,[sponsor][_revision]] - Beside the first part all of them are allowed to be missing. If the full specified locale is not found, the less specific one are looked for. The various parts will be stripped off according to the following order: - (1) revision - (2) sponsor - (3) special - (4) codeset - (5) normalized codeset - (6) territory - (7) audience/modifier + (1) codeset + (2) normalized codeset + (3) territory + (4) modifier */ /* If we have already tested for this locale entry there has to be one data set in the list of loaded domains. */ retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, strlen (dirname) + 1, 0, locale, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, domainname, 0); + NULL, NULL, domainname, 0); if (retval != NULL) { /* We know something about this locale. */ @@ -139,15 +129,14 @@ _nl_find_domain (dirname, locale, domainname, domainbinding) look for the language. Termination symbols are `_' and `@' if we use XPG4 style, and `_', `+', and `,' if we use CEN syntax. */ mask = _nl_explode_name (locale, &language, &modifier, &territory, - &codeset, &normalized_codeset, &special, - &sponsor, &revision); + &codeset, &normalized_codeset); /* Create all possible locale entries which might be interested in generalization. */ retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, strlen (dirname) + 1, mask, language, territory, - codeset, normalized_codeset, modifier, special, - sponsor, revision, domainname, 1); + codeset, normalized_codeset, modifier, + domainname, 1); if (retval == NULL) /* This means we are out of core. */ return NULL; |