projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New module 'wcsncpy'.
[gnulib.git]
/
lib
/
strpbrk.c
diff --git
a/lib/strpbrk.c
b/lib/strpbrk.c
index
2c72d19
..
05e6c51
100644
(file)
--- a/
lib/strpbrk.c
+++ b/
lib/strpbrk.c
@@
-1,4
+1,6
@@
-/* Copyright (C) 1991, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1994, 2000, 2002-2003, 2006, 2009-2011 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.
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,26
+16,27
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
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>
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#undef strpbrk
-/* Find the first ocurrence in S of any character in ACCEPT. */
+/* Find the first oc
c
urrence in S of any character in ACCEPT. */
char *
char *
-strpbrk (s, accept)
- register const char *s;
- register const char *accept;
+strpbrk (const char *s, const char *accept)
{
while (*s != '\0')
{
const char *a = accept;
while (*a != '\0')
{
while (*s != '\0')
{
const char *a = accept;
while (*a != '\0')
- if (*a++ == *s)
- return (char *) s;
+
if (*a++ == *s)
+
return (char *) s;
++s;
}
++s;
}
- return
0
;
+ return
NULL
;
}
}