qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tilegx: fix strstr to build and link better 

The two_way_short_needle() routine included from str-two-way.h
is not used, so mark it so to avoid compiler warnings.

Calling strnlen() breaks linknamespace tests, so change it
to __strnlen().
This commit is contained in:
Chris Metcalf 2014-12-19 22:46:52 -05:00
parent 0c73b4ea0c
commit 95dee05f17
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2014-12-19 Chris Metcalf <cmetcalf@ezchip.com>
* sysdeps/tile/tilegx/strstr.c (STRSTR): Call __strnlen, not
strnlen.
2014-12-19 Ondřej Bílka <neleai@seznam.cz> 2014-12-19 Ondřej Bílka <neleai@seznam.cz>
* string/strncat.c (STRNCAT): Simplify implementation. * string/strncat.c (STRNCAT): Simplify implementation.

3
sysdeps/tile/tilegx/strstr.c
View File

@ -27,6 +27,7 @@
(!memchr ((h) + (h_l), '\0', (j) + (n_l) - (h_l)) \ (!memchr ((h) + (h_l), '\0', (j) + (n_l) - (h_l)) \
&& ((h_l) = (j) + (n_l))) && ((h_l) = (j) + (n_l)))
#include "str-two-way.h" #include "str-two-way.h"
typeof(two_way_short_needle) two_way_short_needle __attribute__((unused));
#undef strstr #undef strstr
@ -238,7 +239,7 @@ STRSTR (const char *haystack_start, const char *needle_start)
} }
/* Fail if NEEDLE is longer than HAYSTACK. */ /* Fail if NEEDLE is longer than HAYSTACK. */
if (strnlen (haystack, needle_len) < needle_len) if (__strnlen (haystack, needle_len) < needle_len)
return NULL; return NULL;
/* Perform the search. Abstract memory is considered to be an array /* Perform the search. Abstract memory is considered to be an array