summaryrefslogtreecommitdiff
path: root/wcsmbs/mbsnrtowcs.c
diff options
context:
space:
mode:
Diffstat (limited to 'wcsmbs/mbsnrtowcs.c')
-rw-r--r--wcsmbs/mbsnrtowcs.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c
index 8d0b9d3609..9ac06fe6c2 100644
--- a/wcsmbs/mbsnrtowcs.c
+++ b/wcsmbs/mbsnrtowcs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996-2000, 2002, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 1996,1997,1998,1999,2000,2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@gnu.org>, 1996.
@@ -17,7 +17,6 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
-#include <assert.h>
#include <dlfcn.h>
#include <errno.h>
#include <gconv.h>
@@ -25,7 +24,7 @@
#include <wchar.h>
#include <wcsmbsload.h>
-#include <sysdep.h>
+#include <assert.h>
#ifndef EILSEQ
# define EILSEQ EINVAL
@@ -63,24 +62,19 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
if (nmc == 0)
return 0;
- srcend = (const unsigned char *) *src + __strnlen (*src, nmc - 1) + 1;
+ srcend = *src + __strnlen (*src, nmc - 1) + 1;
/* Get the conversion functions. */
fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE));
/* Get the structure with the function pointers. */
towc = fcts->towc;
- __gconv_fct fct = towc->__fct;
-#ifdef PTR_DEMANGLE
- if (towc->__shlib_handle != NULL)
- PTR_DEMANGLE (fct);
-#endif
/* We have to handle DST == NULL special. */
if (dst == NULL)
{
wchar_t buf[64]; /* Just an arbitrary size. */
- const unsigned char *inbuf = (const unsigned char *) *src;
+ const unsigned char *inbuf = *src;
result = 0;
data.__outbufend = (unsigned char *) buf + sizeof (buf);
@@ -88,8 +82,9 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
{
data.__outbuf = (unsigned char *) buf;
- status = DL_CALL_FCT (fct, (towc, &data, &inbuf, srcend, NULL,
- &dummy, 0, 1));
+ status = DL_CALL_FCT (towc->__fct,
+ (towc, &data, &inbuf, srcend, NULL,
+ &dummy, 0, 1));
result += (wchar_t *) data.__outbuf - buf;
}
@@ -108,7 +103,7 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
data.__outbuf = (unsigned char *) dst;
data.__outbufend = data.__outbuf + len * sizeof (wchar_t);
- status = DL_CALL_FCT (fct,
+ status = DL_CALL_FCT (towc->__fct,
(towc, &data, (const unsigned char **) src, srcend,
NULL, &dummy, 0, 1));