diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-08-14 22:29:43 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-08-14 22:29:43 +0000 |
| commit | ecad39f050c89d63673101ae0d6b54fb2dfbed1b (patch) | |
| tree | f9dcb3942e37ff87e9f3866b9f6e54daeb681c9c | |
| parent | 1b46e4a5a24d5049ef90cf16a6a851bf796b5782 (diff) | |
| download | glibc-ecad39f050c89d63673101ae0d6b54fb2dfbed1b.zip glibc-ecad39f050c89d63673101ae0d6b54fb2dfbed1b.tar.gz glibc-ecad39f050c89d63673101ae0d6b54fb2dfbed1b.tar.bz2 | |
Update.
2001-08-14 Ulrich Drepper <drepper@redhat.com>
* Makefile: Add rules to build and run tst-xlocale1.
* tst-xlocale1.c: New file.
* bug-iconv-trans.c: Improve error messages.
| -rw-r--r-- | localedata/ChangeLog | 7 | ||||
| -rw-r--r-- | localedata/Makefile | 3 | ||||
| -rw-r--r-- | localedata/bug-iconv-trans.c | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 45d2c1c..63aa9ce 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,10 @@ +2001-08-14 Ulrich Drepper <drepper@redhat.com> + + * Makefile: Add rules to build and run tst-xlocale1. + * tst-xlocale1.c: New file. + + * bug-iconv-trans.c: Improve error messages. + 2001-08-12 Ulrich Drepper <drepper@redhat.com> * charmaps/ISO-IR-209: New file. diff --git a/localedata/Makefile b/localedata/Makefile index 8866b69..5380f41 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -91,7 +91,7 @@ locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl \ tst_wctype tst_wcwidth tests = $(locale_test_suite) tst-digits tst-setlocale bug-iconv-trans \ - tst-leaks tst-mbswcs6 + tst-leaks tst-mbswcs6 tst-xlocale1 ifeq (yes,$(build-shared)) ifneq (no,$(PERL)) tests: $(objpfx)mtrace-tst-leaks @@ -271,6 +271,7 @@ tst_wctype-ENV = $(TEST_MBWC_ENV) tst_wcwidth-ENV = $(TEST_MBWC_ENV) tst-digits-ENV = $(TEST_MBWC_ENV) tst-mbswcs6-ENV = $(TEST_MBWC_ENV) +tst-xlocale1-ENV = $(TEST_MBWC_ENV) tst-setlocale-ENV = LOCPATH=$(common-objpfx)localedata LC_ALL=ja_JP.EUC-JP diff --git a/localedata/bug-iconv-trans.c b/localedata/bug-iconv-trans.c index 8387699..3886247 100644 --- a/localedata/bug-iconv-trans.c +++ b/localedata/bug-iconv-trans.c @@ -33,7 +33,10 @@ main (void) n = iconv (cd, &inptr, &inlen, &outptr, &outlen); if (n != 7) { - printf ("iconv() returned %Zd, expected 7\n", n); + if (n == (size_t) -1) + printf ("iconv() returned error: %m\n"); + else + printf ("iconv() returned %Zd, expected 7\n", n); result = 1; } if (inlen != 0) |