Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180716' into...

[qemu.git] / linux-user / uaccess.c

diff --git a/linux-user/uaccess.c b/linux-user/uaccess.c
index 4d506935f8cad50c48c6c3ee85fee40d556ba47a..0a5c0b0b29727995acdf8a984277c6f97d303af4 100644 (file)
--- a/linux-user/uaccess.c
+++ b/linux-user/uaccess.c
@@ -1,6 +1,6 @@
 /* User memory access */
-#include <stdio.h>
-#include <string.h>
+#include "qemu/osdep.h"
+#include "qemu/cutils.h"
 
 #include "qemu.h"
 
@@ -37,17 +37,6 @@ abi_long copy_to_user(abi_ulong gaddr, void *hptr, size_t len)
     return ret;
 }
 
-/* XXX: use host strnlen if available ? */
-static int qemu_strnlen(const char *s, int max_len)
-{
-    int i;
-    for(i = 0; i < max_len; i++) {
-        if (s[i] == '\0')
-            break;
-    }
-    return i;
-}
-
 /* Return the length of a string in target memory or -TARGET_EFAULT if
    access error  */
 abi_long target_strlen(abi_ulong guest_addr1)