Moving branches closer together.

[pdclib] / functions / string / strxfrm.c

diff --git a/functions/string/strxfrm.c b/functions/string/strxfrm.c
index 1d9e77762b78a53a8dd07a9e1b0c0f082d74eb0b..c17d867f6381c4dc235d4670047fbf38eeaf8977 100644 (file)
--- a/functions/string/strxfrm.c
+++ b/functions/string/strxfrm.c
@@ -12,13 +12,14 @@
 
 size_t strxfrm( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, size_t n )
 {
+    const _PDCLIB_ctype_t * ctype = _PDCLIB_lconv.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;
 }
@@ -26,7 +27,8 @@ size_t strxfrm( char * _PDCLIB_restrict s1, const char * _PDCLIB_restrict s2, si
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+
+#include "_PDCLIB_test.h"
 
 int main( void )
 {
@@ -43,5 +45,5 @@ int main( void )
     TESTCASE( s[10] == '\0' );
     return TEST_RESULTS;
 }
-#endif
 
+#endif