am ae97a776: Merge "string.h: remove unused variable"

* commit 'ae97a776ea900e5923d6d320d72dcc04b224796e':
  string.h: remove unused variable
This commit is contained in:
Nick Kralevich 2014-10-04 22:47:10 +00:00 committed by Android Git Automerger
commit 2b208d96af

View File

@ -117,7 +117,6 @@ __BIONIC_FORTIFY_INLINE
void* memcpy(void* __restrict dest, const void* __restrict src, size_t copy_amount) { void* memcpy(void* __restrict dest, const void* __restrict src, size_t copy_amount) {
char *d = (char *) dest; char *d = (char *) dest;
const char *s = (const char *) src; const char *s = (const char *) src;
size_t s_len = __bos0(s);
size_t d_len = __bos0(d); size_t d_len = __bos0(d);
return __builtin___memcpy_chk(dest, src, copy_amount, d_len); return __builtin___memcpy_chk(dest, src, copy_amount, d_len);