diff options
Diffstat (limited to 'wcsmbs')
| -rw-r--r-- | wcsmbs/mbrtowc.c | 6 | ||||
| -rw-r--r-- | wcsmbs/mbsnrtowcs.c | 6 | ||||
| -rw-r--r-- | wcsmbs/mbsrtowcs_l.c | 12 | ||||
| -rw-r--r-- | wcsmbs/wcrtomb.c | 6 | ||||
| -rw-r--r-- | wcsmbs/wcsnrtombs.c | 6 | ||||
| -rw-r--r-- | wcsmbs/wcsrtombs.c | 6 |
6 files changed, 21 insertions, 21 deletions
diff --git a/wcsmbs/mbrtowc.c b/wcsmbs/mbrtowc.c index 6932b047ae..eb2a312b7c 100644 --- a/wcsmbs/mbrtowc.c +++ b/wcsmbs/mbrtowc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2004 +/* Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. @@ -42,7 +42,7 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) size_t result; size_t dummy; const unsigned char *inbuf, *endbuf; - char *outbuf = (char *) (pwc ?: buf); + unsigned char *outbuf = (unsigned char *) (pwc ?: buf); const struct gconv_fcts *fcts; /* Set information for this step. */ @@ -56,7 +56,7 @@ __mbrtowc (wchar_t *pwc, const char *s, size_t n, mbstate_t *ps) initial state. */ if (s == NULL) { - outbuf = (char *) buf; + outbuf = (unsigned char *) buf; s = ""; n = 1; } diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c index 9ac06fe6c2..ef5ca06e2f 100644 --- a/wcsmbs/mbsnrtowcs.c +++ b/wcsmbs/mbsnrtowcs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996,1997,1998,1999,2000,2002 Free Software Foundation, Inc. +/* Copyright (C) 1996-2000, 2002, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. @@ -62,7 +62,7 @@ __mbsnrtowcs (dst, src, nmc, len, ps) if (nmc == 0) return 0; - srcend = *src + __strnlen (*src, nmc - 1) + 1; + srcend = (const unsigned char *) *src + __strnlen (*src, nmc - 1) + 1; /* Get the conversion functions. */ fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE)); @@ -74,7 +74,7 @@ __mbsnrtowcs (dst, src, nmc, len, ps) if (dst == NULL) { wchar_t buf[64]; /* Just an arbitrary size. */ - const unsigned char *inbuf = *src; + const unsigned char *inbuf = (const unsigned char *) *src; result = 0; data.__outbufend = (unsigned char *) buf + sizeof (buf); diff --git a/wcsmbs/mbsrtowcs_l.c b/wcsmbs/mbsrtowcs_l.c index 8da3095566..c44c8e5066 100644 --- a/wcsmbs/mbsrtowcs_l.c +++ b/wcsmbs/mbsrtowcs_l.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2004 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 2002. @@ -70,16 +70,16 @@ __mbsrtowcs_l (dst, src, len, ps, l) mbstate_t temp_state; wchar_t buf[64]; /* Just an arbitrary size. */ const unsigned char *inbuf = (const unsigned char *) *src; - const unsigned char *srcend = inbuf + strlen (inbuf) + 1; + const unsigned char *srcend = inbuf + strlen (*src) + 1; temp_state = *data.__statep; data.__statep = &temp_state; result = 0; - data.__outbufend = (char *) buf + sizeof (buf); + data.__outbufend = (unsigned char *) buf + sizeof (buf); do { - data.__outbuf = (char *) buf; + data.__outbuf = (unsigned char *) buf; status = DL_CALL_FCT (towc->__fct, (towc, &data, &inbuf, srcend, NULL, @@ -114,7 +114,7 @@ __mbsrtowcs_l (dst, src, len, ps, l) { /* Pessimistic guess as to how much input we can use. In the worst case we need one input byte for one output wchar_t. */ - srcend = srcp + __strnlen (srcp, len) + 1; + srcend = srcp + __strnlen ((const char *) srcp, len) + 1; status = DL_CALL_FCT (towc->__fct, (towc, &data, &srcp, srcend, NULL, @@ -131,7 +131,7 @@ __mbsrtowcs_l (dst, src, len, ps, l) } /* Make the end if the input known to the caller. */ - *src = srcp; + *src = (const char *) srcp; result = (wchar_t *) data.__outbuf - dst; diff --git a/wcsmbs/wcrtomb.c b/wcsmbs/wcrtomb.c index 38144796f8..f7971e704b 100644 --- a/wcsmbs/wcrtomb.c +++ b/wcsmbs/wcrtomb.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996,1997,1998,2000,2002 Free Software Foundation, Inc. +/* Copyright (C) 1996,1997,1998,2000,2002,2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -60,8 +60,8 @@ __wcrtomb (char *s, wchar_t wc, mbstate_t *ps) } /* Tell where we want to have the result. */ - data.__outbuf = s; - data.__outbufend = s + MB_CUR_MAX; + data.__outbuf = (unsigned char *) s; + data.__outbufend = (unsigned char *) s + MB_CUR_MAX; /* Get the conversion functions. */ fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE)); diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c index 0ff26d6671..0252b7fa23 100644 --- a/wcsmbs/wcsnrtombs.c +++ b/wcsmbs/wcsnrtombs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2000, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1996-2000, 2002, 2003, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. @@ -104,8 +104,8 @@ __wcsnrtombs (dst, src, nwc, len, ps) of the string. */ size_t dummy; - data.__outbuf = dst; - data.__outbufend = dst + len; + data.__outbuf = (unsigned char *) dst; + data.__outbufend = (unsigned char *) dst + len; status = DL_CALL_FCT (tomb->__fct, (tomb, &data, (const unsigned char **) src, diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c index 8b444ed8a2..d41ca5366b 100644 --- a/wcsmbs/wcsrtombs.c +++ b/wcsmbs/wcsrtombs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2000, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1996-2000, 2002, 2003, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@gnu.org>, 1996. @@ -105,8 +105,8 @@ __wcsrtombs (dst, src, len, ps) const wchar_t *srcend = *src + __wcsnlen (*src, len) + 1; size_t dummy; - data.__outbuf = dst; - data.__outbufend = dst + len; + data.__outbuf = (unsigned char *) dst; + data.__outbufend = (unsigned char *) dst + len; status = DL_CALL_FCT (tomb->__fct, (tomb, &data, (const unsigned char **) src, |