From 152b9de19ade833ada124390ef153e53d3d3e2ed Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Mon, 10 Mar 2014 15:54:40 -0700
Subject: [PATCH] Remove non-standard memswap.

Change-Id: I06548dda339987b755ef7139c590ca3e1f9fe0a9
---
 libc/Android.mk           |  1 -
 libc/bionic/memswap.c     | 43 ---------------------------------------
 libc/bionic/ndk_cruft.cpp | 14 +++++++++++++
 libc/include/string.h     |  1 -
 4 files changed, 14 insertions(+), 45 deletions(-)
 delete mode 100644 libc/bionic/memswap.c

diff --git a/libc/Android.mk b/libc/Android.mk
index 0ad5af27f..40660a276 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -61,7 +61,6 @@ libc_common_src_files := \
     bionic/ldexp.c \
     bionic/md5.c \
     bionic/memmem.c \
-    bionic/memswap.c \
     bionic/pathconf.c \
     bionic/ptsname.c \
     bionic/ptsname_r.c \
diff --git a/libc/bionic/memswap.c b/libc/bionic/memswap.c
deleted file mode 100644
index 35b0b32ed..000000000
--- a/libc/bionic/memswap.c
+++ /dev/null
@@ -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++;
-    }
-}
diff --git a/libc/bionic/ndk_cruft.cpp b/libc/bionic/ndk_cruft.cpp
index fc9d9d49f..b9153820d 100644
--- a/libc/bionic/ndk_cruft.cpp
+++ b/libc/bionic/ndk_cruft.cpp
@@ -59,4 +59,18 @@ extern "C" void** __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
diff --git a/libc/include/string.h b/libc/include/string.h
index 8963e3d0f..ec998ed35 100644
--- a/libc/include/string.h
+++ b/libc/include/string.h
@@ -42,7 +42,6 @@ extern void*  memcpy(void* __restrict, const void* __restrict, size_t);
 extern void*  memmove(void *, const void *, size_t);
 extern void*  memset(void *, int, size_t);
 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*  strchr(const char *, int) __purefunc;