diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2005-03-19 21:04:10 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2005-03-19 21:04:10 +0000 |
| commit | 8f8ebbc438fcb4b22fba8beb3ef3d1aa59d9d7bf (patch) | |
| tree | b7091affa76bbaf47e78a59dfc72b2102554eaf9 /wcsmbs/mbsnrtowcs.c | |
| parent | f5c3480e830e94e0e51a0bdb1053944daed8bc58 (diff) | |
Updated to fedora-glibc-20050319T1907cvs/fedora-glibc-2_3_4-15
Diffstat (limited to 'wcsmbs/mbsnrtowcs.c')
| -rw-r--r-- | wcsmbs/mbsnrtowcs.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); |