This is the mail archive of the libc-alpha@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[COMMITTED] 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().
---
 ChangeLog                    |    5 +++++
 sysdeps/tile/tilegx/strstr.c |    3 ++-
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4c8bcb4..68a8531 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 3e72789..d04f129 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
-- 
1.7.1


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]