diff options
| author | Chris Metcalf <cmetcalf@ezchip.com> | 2014-12-19 22:46:52 -0500 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@ezchip.com> | 2014-12-19 22:54:35 -0500 |
| commit | 95dee05f17563f737e5a34fde97bdc7fa02a5185 (patch) | |
| tree | bb65a520fdc24a7b53efd45f96c3ff3b5176a507 | |
| parent | 0c73b4ea0c5cd6a82e7acace1ae6a6335ca02e2c (diff) | |
| download | glibc-95dee05f17563f737e5a34fde97bdc7fa02a5185.tar.gz glibc-95dee05f17563f737e5a34fde97bdc7fa02a5185.tar.xz glibc-95dee05f17563f737e5a34fde97bdc7fa02a5185.zip | |
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().
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/tile/tilegx/strstr.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 4c8bcb418f..68a8531c2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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> * string/strncat.c (STRNCAT): Simplify implementation. diff --git a/sysdeps/tile/tilegx/strstr.c b/sysdeps/tile/tilegx/strstr.c index 3e727899c0..d04f12910d 100644 --- a/sysdeps/tile/tilegx/strstr.c +++ b/sysdeps/tile/tilegx/strstr.c @@ -27,6 +27,7 @@ (!memchr ((h) + (h_l), '\0', (j) + (n_l) - (h_l)) \ && ((h_l) = (j) + (n_l))) #include "str-two-way.h" +typeof(two_way_short_needle) two_way_short_needle __attribute__((unused)); #undef strstr @@ -238,7 +239,7 @@ STRSTR (const char *haystack_start, const char *needle_start) } /* Fail if NEEDLE is longer than HAYSTACK. */ - if (strnlen (haystack, needle_len) < needle_len) + if (__strnlen (haystack, needle_len) < needle_len) return NULL; /* Perform the search. Abstract memory is considered to be an array |