X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrpbrk.c;h=72de53a8944d8581a399f73f29f6d23684b178d1;hb=107fb0e6719c49e35a6f4a3bdd0dabb19291efe0;hp=6ed62a63c7cc9876c9fa31ec28950357850216db;hpb=34c0f07b980b0b13d2d18e1dc5c28989eb507b22;p=gnulib.git

diff --git a/lib/strpbrk.c b/lib/strpbrk.c
index 6ed62a63c..72de53a89 100644
--- a/lib/strpbrk.c
+++ b/lib/strpbrk.c
@@ -1,4 +1,6 @@
-/* Copyright (C) 1991, 1994, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006, 2009-2010 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.
 
@@ -14,13 +16,16 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#include <config.h>
+
+#include <stddef.h>
+#include <string.h>
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#undef strpbrk
 
-/* Find the first ocurrence in S of any character in ACCEPT.  */
+/* Find the first occurrence in S of any character in ACCEPT.  */
 char *
 strpbrk (const char *s, const char *accept)
 {
@@ -28,10 +33,10 @@ strpbrk (const char *s, const char *accept)
     {
       const char *a = accept;
       while (*a != '\0')
-	if (*a++ == *s)
-	  return (char *) s;
+        if (*a++ == *s)
+          return (char *) s;
       ++s;
     }
 
-  return 0;
+  return NULL;
 }