commit d662bab2b0a75beb04c8b52892bf6797904e0a71
author George Burgess IV <gbiv@google.com> Tue Apr 04 20:12:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 04 20:12:57 2017 +0000
tree 34a3ab3ab8a295724415a2f3fad556cefaaf0384
parent 32e5998ec64054ff6bbed7543aa29ddd086198f9
parent 1bdd0764af339a7e2bb07267e9dc732b9fac31d9

Merge "libc: use __bos instead of __bos0 for strchr." am: defecea27b
am: 1bdd0764af

Change-Id: I946be49da1f47916b170a00a2484605054258f54

libc/include/string.h

diff --git a/libc/include/string.h b/libc/include/string.h
index 26bd93f..0cbd61c 100644
--- a/libc/include/string.h
+++ b/libc/include/string.h
@@ -358,9 +358,9 @@
 
 #if  __ANDROID_API__ >= __ANDROID_API_J_MR2__
 __BIONIC_FORTIFY_INLINE
-char* strchr(const char* const _Nonnull s __pass_object_size0, int c)
+char* strchr(const char* const _Nonnull s __pass_object_size, int c)
         __overloadable {
-    size_t bos = __bos0(s);
+    size_t bos = __bos(s);
 
     if (bos == __BIONIC_FORTIFY_UNKNOWN_SIZE) {
         return __builtin_strchr(s, c);