PDCLIB-1 PDCLIB-2 PDCLIB-9 PDCLIB-12: Add thread specific locale support; migrate...

[pdclib] / functions / string / strxfrm.c

diff --git a/functions/string/strxfrm.c b/functions/string/strxfrm.c
index 4f5e4a099bb1902f502b26dce62faa77ef1dce97..3ea8d0fab6259c0f8c983eb4548a7d005fe037c9 100644 (file)
--- a/functions/string/strxfrm.c
+++ b/functions/string/strxfrm.c
@@ -10,17 +10,18 @@
 
 #ifndef REGTEST
 
-#include <locale.h>
+#include <_PDCLIB_locale.h>
 
 size_t strxfrm( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, size_t n )
 {
+    _PDCLIB_ctype_t *ctype = _PDCLIB_threadlocale()->_CType;
     size_t len = strlen( s2 );
     if ( len < n )
     {
         /* Cannot use strncpy() here as the filling of s1 with '\0' is not part
            of the spec.
         */
-        while ( n-- && ( *s1++ = _PDCLIB_lconv.ctype[(unsigned char)*s2++].collation ) );
+        while ( n-- && ( *s1++ = ctype[(unsigned char)*s2++].collation ) );
     }
     return len;
 }