X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fstrchr.c;h=826d6875122d91052095636823f57bfd06087510;hb=d9dcf16664c81809258992e1653ecb68c8079974;hp=bff8d054e20ae212c8d5e96064e1b8bbe2a5729d;hpb=fadedcfc3b45653d82210cbd418effc45c46c272;p=pdclib.old

diff --git a/functions/string/strchr.c b/functions/string/strchr.c
index bff8d05..826d687 100644
--- a/functions/string/strchr.c
+++ b/functions/string/strchr.c
@@ -1,21 +1,40 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* $Id$ */
 
-#include <__NULL.h>
+/* strchr( const char *, int )
 
-char * strchr( const char * src, int c )
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
+
+#include <string.h>
+
+#ifndef REGTEST
+
+char * strchr( const char * s, int c )
 {
-    while ( *src != '\0' )
+    do
     {
-        if ( *src == (const char) c )
+        if ( *s == (char) c )
         {
-            return (char *) src;
+            return (char *) s;
         }
-        ++src;
-    }
+    } while ( *s++ );
     return NULL;
 }
+
+#endif
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main( void )
+{
+    char abccd[] = "abccd";
+    TESTCASE( strchr( abccd, 'x' ) == NULL );
+    TESTCASE( strchr( abccd, 'a' ) == &abccd[0] );
+    TESTCASE( strchr( abccd, 'd' ) == &abccd[4] );
+    TESTCASE( strchr( abccd, '\0' ) == &abccd[5] );
+    TESTCASE( strchr( abccd, 'c' ) == &abccd[2] );
+    return TEST_RESULTS;
+}
+#endif