openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix strstr16." into nyc-dev am: a34a383607 

am: a12fb416d7

* commit 'a12fb416d7b2105f3a7fd9ae78cf98eaf183092d':
  Fix strstr16.

Change-Id: I6776ce521daf4b45f22c55dbee714f2abe8c599e
This commit is contained in:
Michael Wright 2016-05-17 17:33:29 +00:00 committed by android-build-merger
parent 8d6aad114b a12fb416d7
commit aa7b0312e0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libutils/Unicode.cpp
View File

@ -292,6 +292,7 @@ size_t strnlen16(const char16_t *s, size_t maxlen)
char16_t* strstr16(const char16_t* src, const char16_t* target)
{
const char16_t needle = *target++;
const size_t target_len = strlen16(target);
if (needle != '\0') {
do {
do {
@ -299,7 +300,7 @@ char16_t* strstr16(const char16_t* src, const char16_t* target)
return nullptr;
}
} while (*src++ != needle);
} while (strcmp16(src, target) != 0);
} while (strncmp16(src, target, target_len) != 0);
src--;
}