From 45a9eda2f9b8245d1586ceb51bb3543fc2a2a9f6 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 25 Jun 2000 20:26:58 +0000 Subject: Update. * locale/programs/ld-address.c (INT_STR_ELEM): Correct test for unknown character. --- ChangeLog | 3 +++ locale/programs/ld-address.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 249fd8edbb..b98e41f172 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2000-06-25 Ulrich Drepper + * locale/programs/ld-address.c (INT_STR_ELEM): Correct test for + unknown character. + * locale/programs/ld-collate.c: Correct handling of different collation sections. * locale/programs/localedef.c (add_to_readlist): Take locale pointer diff --git a/locale/programs/ld-address.c b/locale/programs/ld-address.c index d440b36ae8..e35305d44c 100644 --- a/locale/programs/ld-address.c +++ b/locale/programs/ld-address.c @@ -520,7 +520,8 @@ address_read (struct linereader *ldfile, struct localedef_t *result, if (address->cat != NULL) \ lr_error (ldfile, _("\ %s: field `%s' declared more than once"), "LC_ADDRESS", #cat); \ - else if (!ignore_content && arg->val.str.startmb == NULL) \ + else if (!ignore_content && arg->tok == tok_string \ + && arg->val.str.startmb == NULL) \ { \ lr_error (ldfile, _("\ %s: unknown character in field `%s'"), "LC_ADDRESS", #cat); \ -- cgit v1.2.3