Re-import from Subversion.

[pdclib] / functions / string / strpbrk.c

diff --git a/functions/string/strpbrk.c b/functions/string/strpbrk.c
index 810e40ca40b9f5b51b4e708f3699773b777c90de..1006ab6d21a32b995ff3b29965310f21626447fc 100644 (file)
--- a/functions/string/strpbrk.c
+++ b/functions/string/strpbrk.c
@@ -1,37 +1,27 @@
-// ----------------------------------------------------------------------------
-// $Id$
-// ----------------------------------------------------------------------------
-// Public Domain C Library - http://pdclib.sourceforge.net
-// This code is Public Domain. Use, modify, and redistribute at will.
-// ----------------------------------------------------------------------------
+/* ----------------------------------------------------------------------------
+ * $Id$
+ * ----------------------------------------------------------------------------
+ * Public Domain C Library - http://pdclib.sourceforge.net
+ * This code is Public Domain. Use, modify, and redistribute at will.
+ * --------------------------------------------------------------------------*/
 
-// ----------------------------------------------------------------------------
-// C++
+#include <__NULL.h>
 
-const char * strpbrk( const char * s1, const char * s2 ) { /* TODO */ };
-char * strpbrk( char * s1, const char * s2 ) { /* TODO */ };
-
-// ----------------------------------------------------------------------------
-// Standard C
-
-char * strpbrk( const char *s1, const char * s2 ) { /* TODO */ };
-
-/* PDPC code - unreviewed
+char * strpbrk( const char *src_1, const char * src_2 )
 {
-    const char *p1;
-    const char *p2;
-    
-    p1 = s1;
-    while (*p1 != '\0')
+    const char * p1 = src_1;
+    const char * p2;
+    while ( *p1 != '\0' )
     {
-        p2 = s2;
-        while (*p2 != '\0')
+        p2 = src_2;
+        while ( *p2 != '\0' )
         {
-            if (*p1 == *p2) return ((char *)p1);
-            p2++;
+            if ( *p1 == *p2++ )
+            {
+                return (char *) p1;
+            }
         }
-        p1++;
+        ++p1;
     }
-    return (NULL);
+    return NULL;
 }
-*/