diff options
Diffstat (limited to 'localedata')
| -rw-r--r-- | localedata/ChangeLog | 6 | ||||
| -rw-r--r-- | localedata/tst-ctype.c | 14 | ||||
| -rw-r--r-- | localedata/tst-mbswcs1.c | 16 |
3 files changed, 21 insertions, 15 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 67a60bd8be..f4c29fc173 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,9 @@ +2005-12-27 Roland McGrath <roland@redhat.com> + + * tst-ctype.c (main): Add some casts. + + * tst-mbswcs1.c (main): Make BUF const. Add casts in mbrtowc calls. + 2006-01-02 Andreas Jaeger <aj@suse.de> * locales/fi_FI: Fix date_fmt. diff --git a/localedata/tst-ctype.c b/localedata/tst-ctype.c index fb2e78cbb2..f4e01f0826 100644 --- a/localedata/tst-ctype.c +++ b/localedata/tst-ctype.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000,02 Free Software Foundation, Inc. +/* Copyright (C) 2000,02, 05 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 2000. @@ -345,14 +345,14 @@ punct = %04x alnum = %04x\n", || getline (&resline, &reslinelen, stdin) <= 0) break; - inp = strchr (inpline, '\n'); + inp = (unsigned char *) strchr (inpline, '\n'); if (inp != NULL) *inp = '\0'; - resp = strchr (resline, '\n'); + resp = (unsigned char *) strchr (resline, '\n'); if (resp != NULL) *resp = '\0'; - inp = inpline; + inp = (unsigned char *) inpline; while (*inp != ' ' && *inp != '\t' && *inp && *inp != '\n' && *inp != '\0') ++inp; @@ -371,11 +371,11 @@ punct = %04x alnum = %04x\n", if (strcmp (inpline, classes[n].name) == 0) break; - resp = resline; + resp = (unsigned char *) resline; while (*resp == ' ' || *resp == '\t') ++resp; - if (strlen (inp) != strlen (resp)) + if (strlen ((char *) inp) != strlen ((char *) resp)) { printf ("lines \"%.20s\"... and \"%.20s\" have not the same length\n", inp, resp); @@ -384,7 +384,7 @@ punct = %04x alnum = %04x\n", if (n < nclasses) { - if (strspn (resp, "01") != strlen (resp)) + if (strspn ((char *) resp, "01") != strlen ((char *) resp)) { printf ("result string \"%s\" malformed\n", resp); continue; diff --git a/localedata/tst-mbswcs1.c b/localedata/tst-mbswcs1.c index 93795beb9e..fb2ea84cdd 100644 --- a/localedata/tst-mbswcs1.c +++ b/localedata/tst-mbswcs1.c @@ -1,5 +1,5 @@ /* Test restarting behaviour of mbrtowc. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Bruno Haible <haible@ilog.fr>. @@ -37,7 +37,7 @@ int main (void) { - unsigned char buf[6] = { 0x25, 0xe2, 0x82, 0xac, 0xce, 0xbb }; + const unsigned char buf[6] = { 0x25, 0xe2, 0x82, 0xac, 0xce, 0xbb }; mbstate_t state; wchar_t wc = 42; size_t n; @@ -52,12 +52,12 @@ main (void) memset (&state, '\0', sizeof (state)); - show (mbrtowc (&wc, buf + 0, 1, &state), 1, 37); - show (mbrtowc (&wc, buf + 1, 1, &state), -2, 37); - show (mbrtowc (&wc, buf + 2, 3, &state), 2, 8364); - show (mbrtowc (&wc, buf + 4, 1, &state), -2, 8364); - show (mbrtowc (&wc, buf + 5, 1, &state), 1, 955); - show (mbrtowc (&wc, buf + 5, 1, &state), -1, 955); + show (mbrtowc (&wc, (const char *) buf + 0, 1, &state), 1, 37); + show (mbrtowc (&wc, (const char *) buf + 1, 1, &state), -2, 37); + show (mbrtowc (&wc, (const char *) buf + 2, 3, &state), 2, 8364); + show (mbrtowc (&wc, (const char *) buf + 4, 1, &state), -2, 8364); + show (mbrtowc (&wc, (const char *) buf + 5, 1, &state), 1, 955); + show (mbrtowc (&wc, (const char *) buf + 5, 1, &state), -1, 955); return result; } |