X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fmemchr.c;h=972e7ffa82038908872e99f22e5ed2c4d9566922;hb=40d0246771c8e593d4b5fdc97dd87b4afd260be2;hp=1c9563c7efa3641f166009935fe281cb0ce00c06;hpb=1d9d92ba957a0b8307c9a65c35867fde68e6533b;p=pdclib

diff --git a/functions/string/memchr.c b/functions/string/memchr.c
index 1c9563c..972e7ff 100644
--- a/functions/string/memchr.c
+++ b/functions/string/memchr.c
@@ -1,16 +1,20 @@
-/* ----------------------------------------------------------------------------
- * $Id$
- * ----------------------------------------------------------------------------
- * Public Domain C Library - http://pdclib.sourceforge.net
- * This code is Public Domain. Use, modify, and redistribute at will.
- * --------------------------------------------------------------------------*/
+/* $Id$ */
 
-#include <__size_t.h>
-#include <__NULL.h>
+/* Release $Name$ */
 
-void * memchr( const void * src, int c, size_t n )
+/* memchr( const void *, int, size_t )
+
+   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
+
+void * memchr( const void * s, int c, size_t n )
 {
-    const unsigned char * p = (const unsigned char *) src;
+    const unsigned char * p = (const unsigned char *) s;
     while ( n-- )
     {
         if ( *p == (unsigned char) c )
@@ -21,3 +25,20 @@ void * memchr( const void * src, int c, size_t n )
     }
     return NULL;
 }
+
+#endif
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main()
+{
+    BEGIN_TESTS;
+    TESTCASE( memchr( abcde, 'c', 5 ) == &abcde[2] );
+    TESTCASE( memchr( abcde, 'a', 1 ) == &abcde[0] );
+    TESTCASE( memchr( abcde, 'a', 0 ) == NULL );
+    TESTCASE( memchr( abcde, '\0', 5 ) == NULL );
+    TESTCASE( memchr( abcde, '\0', 6 ) == &abcde[5] );
+    return TEST_RESULTS;
+}
+#endif