generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 321ecc4e: Merge "Remove non-standard memswap."

Browse Source 
* commit '321ecc4eaf9d061905f009494b420a604e1d973e':
  Remove non-standard memswap.
This commit is contained in:
Elliott Hughes 2014-03-10 23:18:03 +00:00 committed by Android Git Automerger
commit acc635740c
4 changed files with 14 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libc/Android.mk
View File

@ -61,7 +61,6 @@ libc_common_src_files := \
bionic/ldexp.c \ bionic/ldexp.c \
bionic/md5.c \ bionic/md5.c \
bionic/memmem.c \ bionic/memmem.c \
bionic/memswap.c \
bionic/pathconf.c \ bionic/pathconf.c \
bionic/ptsname.c \ bionic/ptsname.c \
bionic/ptsname_r.c \ bionic/ptsname_r.c \

43
libc/bionic/memswap.c
View File

@ -1,43 +0,0 @@
/*
* Copyright (C) 2008 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <string.h>
void memswap(void *m1, void *m2, size_t n)
{
char* p = m1;
char* p_end = p + n;
char* q = m2;
while (p < p_end) {
char tmp = *p;
*p = *q;
*q = tmp;
p++;
q++;
}
}

14
libc/bionic/ndk_cruft.cpp
View File

@ -59,4 +59,18 @@ extern "C" void** __get_tls() {
return __get_tls(); return __get_tls();
} }
// This non-standard function was in our <string.h> for some reason.
extern "C" void memswap(void* m1, void* m2, size_t n) {
char* p = reinterpret_cast<char*>(m1);
char* p_end = p + n;
char* q = reinterpret_cast<char*>(m2);
while (p < p_end) {
char tmp = *p;
*p = *q;
*q = tmp;
p++;
q++;
}
}
#endif #endif

1
libc/include/string.h
View File

@ -42,7 +42,6 @@ extern void* memcpy(void* __restrict, const void* __restrict, size_t);
extern void* memmove(void *, const void *, size_t); extern void* memmove(void *, const void *, size_t);
extern void* memset(void *, int, size_t); extern void* memset(void *, int, size_t);
extern void* memmem(const void *, size_t, const void *, size_t) __purefunc; extern void* memmem(const void *, size_t, const void *, size_t) __purefunc;
extern void memswap(void *, void *, size_t);
extern char* index(const char *, int) __purefunc; extern char* index(const char *, int) __purefunc;
extern char* strchr(const char *, int) __purefunc; extern char* strchr(const char *, int) __purefunc;