diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-04-04 22:37:38 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-04-04 22:37:38 +0000 |
| commit | 4e82c610255f6a186c20c73e74f8e71dcda98efc (patch) | |
| tree | b55a3e6692a0261c576330950793bde88524e0e1 /intl/bindtextdom.c | |
| parent | 7a50b1f6d1bd959ae5dfb5539d9cd8935eb8d926 (diff) | |
| download | glibc-4e82c610255f6a186c20c73e74f8e71dcda98efc.zip glibc-4e82c610255f6a186c20c73e74f8e71dcda98efc.tar.gz glibc-4e82c610255f6a186c20c73e74f8e71dcda98efc.tar.bz2 | |
* intl/tst-gettext3.c: New file.
* intl/tst-gettext3.sh: New file.
* intl/Makefile (distribute): Add tst-gettext3.sh.
(test-srcs): Add tst-gettext3.
(tests): Depend on tst-gettext3.out.
(tst-gettext3.out): New rule.
(CFLAGS-tst-gettext3.c): New variable.
Fix bug exposed by tst-gettext3.
* intl/gettextP.h (struct converted_domain): New type.
(struct loaded_domain): Remove the conv, conv_tab fields. Add
conversions, nconversions fields.
(_nl_init_domain_conv): Remove declaration.
(_nl_free_domain_conv): Remove declaration.
(_nl_find_msg): Add convert argument.
* intl/dcigettext.c (DCIGETTEXT): Call _nl_find_msg with convert=1.
(_nl_find_msg): Add convert argument. When a conversion to a different
charset is needed, create a new converted_domain element, instead of
throwing away the old converted translations.
(get_output_charset): New function.
* intl/loadmsgcat.c (_nl_init_domain_conv): Remove function.
(_nl_free_domain_conv): Remove function.
(_nl_load_domain): Initialize the conversions array to empty. Use
_nl_find_msg instead of _nl_init_domain_conv to retrieve the header
entry.
(_nl_unload_domain): Free the conversions array and its contents.
* intl/gettextP.h (struct loaded_domain): Remove codeset_cntr field.
(struct binding): Likewise.
* intl/bindtextdom.c (set_binding_values): Drop codeset_cntr
modifications.
Diffstat (limited to 'intl/bindtextdom.c')
| -rw-r--r-- | intl/bindtextdom.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/intl/bindtextdom.c b/intl/bindtextdom.c index 546da8e..fd527a1 100644 --- a/intl/bindtextdom.c +++ b/intl/bindtextdom.c @@ -207,7 +207,6 @@ set_binding_values (domainname, dirnamep, codesetp) free (binding->codeset); binding->codeset = result; - ++binding->codeset_cntr; modified = 1; } } @@ -271,8 +270,6 @@ set_binding_values (domainname, dirnamep, codesetp) /* The default value. */ new_binding->dirname = (char *) _nl_default_dirname; - new_binding->codeset_cntr = 0; - if (codesetp) { const char *codeset = *codesetp; @@ -293,7 +290,6 @@ set_binding_values (domainname, dirnamep, codesetp) memcpy (result, codeset, len); #endif codeset = result; - ++new_binding->codeset_cntr; } *codesetp = codeset; new_binding->codeset = (char *) codeset; |