[src/trunk]: src/sys/rump/librump/rumpkern copystr is now in libkern; don't r...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7b8bc2db622d
branches:  trunk
changeset: 973440:7b8bc2db622d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 01 00:42:13 2020 +0000

description:
copystr is now in libkern; don't redefine it in rumpcopy.c.

Should fix build breakage from the copystr changes.

diffstat:

 sys/rump/librump/rumpkern/rumpcopy.c |  22 ++--------------------
 1 files changed, 2 insertions(+), 20 deletions(-)

diffs (43 lines):

diff -r 2c8c74680d89 -r 7b8bc2db622d sys/rump/librump/rumpkern/rumpcopy.c
--- a/sys/rump/librump/rumpkern/rumpcopy.c      Tue Jun 30 23:51:47 2020 +0000
+++ b/sys/rump/librump/rumpkern/rumpcopy.c      Wed Jul 01 00:42:13 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rumpcopy.c,v 1.24 2020/04/05 15:16:11 kamil Exp $      */
+/*     $NetBSD: rumpcopy.c,v 1.25 2020/07/01 00:42:13 riastradh Exp $  */
 
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpcopy.c,v 1.24 2020/04/05 15:16:11 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpcopy.c,v 1.25 2020/07/01 00:42:13 riastradh Exp $");
 
 #define        __UFETCHSTORE_PRIVATE
 #define        __UCAS_PRIVATE
@@ -84,24 +84,6 @@
 }
 
 int
-copystr(const void *kfaddr, void *kdaddr, size_t len, size_t *done)
-{
-       uint8_t *to = kdaddr;
-       const uint8_t *from = kfaddr;
-       size_t actlen = 0;
-
-       while (len-- > 0 && (*to++ = *from++) != 0)
-               actlen++;
-
-       if (len+1 == 0 && *(to-1) != 0)
-               return ENAMETOOLONG;
-
-       if (done)
-               *done = actlen+1; /* + '\0' */
-       return 0;
-}
-
-int
 copyinstr(const void *uaddr, void *kaddr, size_t len, size_t *done)
 {
        uint8_t *to;