Module Name: src
Committed By: riastradh
Date: Wed Jul 1 00:42:13 UTC 2020
Modified Files:
src/sys/rump/librump/rumpkern: rumpcopy.c
Log Message:
copystr is now in libkern; don't redefine it in rumpcopy.c.
Should fix build breakage from the copystr changes.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/rump/librump/rumpkern/rumpcopy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/rumpcopy.c
diff -u src/sys/rump/librump/rumpkern/rumpcopy.c:1.24 src/sys/rump/librump/rumpkern/rumpcopy.c:1.25
--- src/sys/rump/librump/rumpkern/rumpcopy.c:1.24 Sun Apr 5 15:16:11 2020
+++ src/sys/rump/librump/rumpkern/rumpcopy.c Wed Jul 1 00:42:13 2020
@@ -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 @@ copyout(const void *kaddr, void *uaddr,
}
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;
