Moving branches closer together.

[pdclib] / functions / string / strcoll.c

diff --git a/functions/string/strcoll.c b/functions/string/strcoll.c
index 16a5680b610c14ea5aaf078f60ced375095753b8..a139adb4728171c50fecc6d0941d3820d1eaa173 100644 (file)
--- a/functions/string/strcoll.c
+++ b/functions/string/strcoll.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* strcoll( const char *, const char * )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -14,18 +12,21 @@
 
 int strcoll( const char * s1, const char * s2 )
 {
-    while ( ( *s1 ) && ( _PDCLIB_lconv.ctype[(unsigned char)*s1].collation == _PDCLIB_lconv.ctype[(unsigned char)*s2].collation ) )
+    const _PDCLIB_ctype_t * ctype = _PDCLIB_lconv.ctype;
+
+    while ( ( *s1 ) && ( ctype[(unsigned char)*s1].collation == ctype[(unsigned char)*s2].collation ) )
     {
         ++s1;
         ++s2;
     }
-    return ( _PDCLIB_lconv.ctype[(unsigned char)*s1].collation == _PDCLIB_lconv.ctype[(unsigned char)*s2].collation );
+    return ( ctype[(unsigned char)*s1].collation == ctype[(unsigned char)*s2].collation );
 }
 
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+
+#include "_PDCLIB_test.h"
 
 int main( void )
 {
@@ -38,4 +39,5 @@ int main( void )
     TESTCASE( strcmp( abcde, empty ) > 0 );
     return TEST_RESULTS;
 }
+
 #endif