New modules: utf8-ucs4, utf16-ucs4, ucs4-utf8, ucs4-utf16.

[gnulib.git] / lib / strpbrk.c

diff --git a/lib/strpbrk.c b/lib/strpbrk.c
index 2c72d19..01d8df5 100644 (file)
--- a/lib/strpbrk.c
+++ b/lib/strpbrk.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 2000, 2002 Free Software Foundation, Inc.
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 
@@ -20,11 +20,17 @@
 # include <config.h>
 #endif
 
-/* Find the first ocurrence in S of any character in ACCEPT.  */
+#include <stddef.h>
+
+#if defined _LIBC || HAVE_STRING_H
+# include <string.h>
+#endif
+
+#undef strpbrk
+
+/* Find the first occurrence in S of any character in ACCEPT.  */
 char *
-strpbrk (s, accept)
-     register const char *s;
-     register const char *accept;
+strpbrk (const char *s, const char *accept)
 {
   while (*s != '\0')
     {
@@ -35,5 +41,5 @@ strpbrk (s, accept)
       ++s;
     }
 
-  return 0;
+  return NULL;
 }