Comment cleanups.

[pdclib] / functions / string / strrchr.c

diff --git a/functions/string/strrchr.c b/functions/string/strrchr.c
index 8ad992ae69402c35c0e309ca93dab0a9335f827f..7387f22f0e1953687154e312e030d0c80a9f8a82 100644 (file)
--- a/functions/string/strrchr.c
+++ b/functions/string/strrchr.c
@@ -1,8 +1,4 @@
-/* $Id$ */
-
-/* Release $Name$ */
-
-/* strrchr( const char *, int c )
+/* strrchr( const char *, int )
 
    This file is part of the Public Domain C Library (PDCLib).
    Permission is granted to use, modify, and / or redistribute at will.
@@ -10,16 +6,34 @@
 
 #include <string.h>
 
+#ifndef REGTEST
+
 char * strrchr( const char * s, int c )
 {
     size_t i = 0;
-    while ( p[i++] );
+    while ( s[i++] );
     do
     {
-        if ( p[--i] == (char) c )
+        if ( s[--i] == (char) c )
         {
-            return (char *) p + i;
+            return (char *) s + i;
         }
     } while ( i );
     return NULL;
 }
+
+#endif
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main( void )
+{
+    char abccd[] = "abccd";
+    TESTCASE( strrchr( abcde, '\0' ) == &abcde[5] );
+    TESTCASE( strrchr( abcde, 'e' ) == &abcde[4] );
+    TESTCASE( strrchr( abcde, 'a' ) == &abcde[0] );
+    TESTCASE( strrchr( abccd, 'c' ) == &abccd[3] );
+    return TEST_RESULTS;
+}
+#endif