about summary refs log tree commit diff
path: root/wcsmbs/mbsnrtowcs.c
diff options
context:
space:
mode:
Diffstat (limited to 'wcsmbs/mbsnrtowcs.c')
-rw-r--r--wcsmbs/mbsnrtowcs.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c
index 7014aa52a2..9ac06fe6c2 100644
--- a/wcsmbs/mbsnrtowcs.c
+++ b/wcsmbs/mbsnrtowcs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1998, 1999, 2000 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.
 
@@ -51,6 +51,7 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
   int status;
   struct __gconv_step *towc;
   size_t dummy;
+  const struct gconv_fcts *fcts;
 
   /* Tell where we want the result.  */
   data.__invocation_counter = 0;
@@ -63,11 +64,11 @@ __mbsnrtowcs (dst, src, nmc, len, ps)
     return 0;
   srcend = *src + __strnlen (*src, nmc - 1) + 1;
 
-  /* Make sure we use the correct function.  */
-  update_conversion_ptrs ();
+  /* Get the conversion functions.  */
+  fcts = get_gconv_fcts (_NL_CURRENT_DATA (LC_CTYPE));
 
   /* Get the structure with the function pointers.  */
-  towc = __wcsmbs_gconv_fcts.towc;
+  towc = fcts->towc;
 
   /* We have to handle DST == NULL special.  */
   if (dst == NULL)