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
01d8df5
..
05e6c51
100644
(file)
--- a/
lib/strpbrk.c
+++ b/
lib/strpbrk.c
@@
-1,4
+1,6
@@
-/* Copyright (C) 1991, 1994, 2000, 2002 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,17
+16,12
@@
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., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <stddef.h>
#include <stddef.h>
-
-#if defined _LIBC || HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>
#undef strpbrk
#undef strpbrk
@@
-36,8
+33,8
@@
strpbrk (const char *s, const char *accept)
{
const char *a = accept;
while (*a != '\0')
{
const char *a = accept;
while (*a != '\0')
- if (*a++ == *s)
- return (char *) s;
+
if (*a++ == *s)
+
return (char *) s;
++s;
}
++s;
}