X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstring%2Fmemchr.c;h=f2add9dcdeccf04b2be0fa7f5a1706273d6ef2c3;hb=d9dcf16664c81809258992e1653ecb68c8079974;hp=6a6440a80e3a6010937ee22402d3d289802879fe;hpb=e5456e3c2697c4e17fc9aa3439f2e305517b4d96;p=pdclib.old

diff --git a/functions/string/memchr.c b/functions/string/memchr.c
index 6a6440a..f2add9d 100644
--- a/functions/string/memchr.c
+++ b/functions/string/memchr.c
@@ -1,33 +1,41 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* $Id$ */
 
-// ----------------------------------------------------------------------------
-// C++
+/* memchr( const void *, int, size_t )
 
-const void * memchr( const void * s, int c, size_t n ) { /* TODO */ };
-void * memchr( void * s, int c, size_t n ) { /* TODO */ };
+   This file is part of the Public Domain C Library (PDCLib).
+   Permission is granted to use, modify, and / or redistribute at will.
+*/
 
-// ----------------------------------------------------------------------------
-// Standard C
+#include <string.h>
 
-void * memchr( const void * s, int c, size_t n ) { /* TODO */ };
+#ifndef REGTEST
 
-/* PDPC code - unreviewed
+void * memchr( const void * s, int c, size_t n )
 {
-    const unsigned char *p;
-    size_t x = 0;
-    
-    p = (const unsigned char *)s;
-    while (x < n)
+    const unsigned char * p = (const unsigned char *) s;
+    while ( n-- )
     {
-        if (*p == (unsigned char)c) return ((void *)p);
-        p++;
-        x++;
+        if ( *p == (unsigned char) c )
+        {
+            return (void *) p;
+        }
+        ++p;
     }
-    return (NULL);
+    return NULL;
 }
-*/
+
+#endif
+
+#ifdef TEST
+#include <_PDCLIB_test.h>
+
+int main( void )
+{
+    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