projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add module mathl.
[gnulib.git]
/
lib
/
strnlen.c
diff --git
a/lib/strnlen.c
b/lib/strnlen.c
index
556d2d5
..
e7ad6d2
100644
(file)
--- a/
lib/strnlen.c
+++ b/
lib/strnlen.c
@@
-1,5
+1,5
@@
/* Find the length of STRING, but scan at most MAXLEN characters.
/* Find the length of STRING, but scan at most MAXLEN characters.
- Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 2000
-2003
Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@
-20,6
+20,7
@@
#if HAVE_CONFIG_H
# include <config.h>
#endif
#if HAVE_CONFIG_H
# include <config.h>
#endif
+#undef strnlen
#if HAVE_STRING_H
# if !STDC_HEADERS && HAVE_MEMORY_H
#if HAVE_STRING_H
# if !STDC_HEADERS && HAVE_MEMORY_H
@@
-40,6
+41,10
@@
char *memchr ();
#undef __strnlen
#undef strnlen
#undef __strnlen
#undef strnlen
+#ifndef _LIBC
+# define strnlen rpl_strnlen
+#endif
+
#ifndef weak_alias
# define __strnlen strnlen
#endif
#ifndef weak_alias
# define __strnlen strnlen
#endif
@@
-51,7
+56,7
@@
size_t
__strnlen (const char *string, size_t maxlen)
{
const char *end = memchr (string, '\0', maxlen);
__strnlen (const char *string, size_t maxlen)
{
const char *end = memchr (string, '\0', maxlen);
- return end ?
end - string
: maxlen;
+ return end ?
(size_t) (end - string)
: maxlen;
}
#ifdef weak_alias
weak_alias (__strnlen, strnlen)
}
#ifdef weak_alias
weak_alias (__strnlen, strnlen)