From 0c6b29846c728c2a066dc8762a991928c597f345 Mon Sep 17 00:00:00 2001 From: avsm <> Date: Sat, 21 Jun 2003 12:04:01 +0000 Subject: [PATCH] clarify these functions by changing references from strings to buffers ok deraadt@, millert@, jmc@, suggested by espie@ --- src/lib/libc/string/bcopy.3 | 10 +++++----- src/lib/libc/string/memcpy.3 | 12 ++++++------ src/lib/libc/string/memmove.3 | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/lib/libc/string/bcopy.3 b/src/lib/libc/string/bcopy.3 index 526b08a7..7b55bcbf 100644 --- a/src/lib/libc/string/bcopy.3 +++ b/src/lib/libc/string/bcopy.3 @@ -28,14 +28,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: bcopy.3,v 1.7 2003/06/02 20:18:38 millert Exp $ +.\" $OpenBSD: bcopy.3,v 1.8 2003/06/21 12:04:01 avsm Exp $ .\" .Dd April 19, 1991 .Dt BCOPY 3 .Os .Sh NAME .Nm bcopy -.Nd copy byte string +.Nd copy bytes .Sh SYNOPSIS .Fd #include .Ft void @@ -45,11 +45,11 @@ The .Fn bcopy function copies .Fa len -bytes from string +bytes from buffer .Fa src -to string +to buffer .Fa dst . -The two strings may overlap. +The two buffers may overlap. If .Fa len is zero, no bytes are copied. diff --git a/src/lib/libc/string/memcpy.3 b/src/lib/libc/string/memcpy.3 index 7e9e5e4c..c8265d94 100644 --- a/src/lib/libc/string/memcpy.3 +++ b/src/lib/libc/string/memcpy.3 @@ -29,14 +29,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: memcpy.3,v 1.5 2003/06/02 20:18:38 millert Exp $ +.\" $OpenBSD: memcpy.3,v 1.6 2003/06/21 12:04:01 avsm Exp $ .\" .Dd June 29, 1991 .Dt MEMCPY 3 .Os .Sh NAME .Nm memcpy -.Nd copy byte string +.Nd copy bytes .Sh SYNOPSIS .Fd #include .Ft void * @@ -46,9 +46,9 @@ The .Fn memcpy function copies .Fa len -bytes from string +bytes from buffer .Fa src -to string +to buffer .Fa dst . .Sh RETURN VALUES The @@ -71,7 +71,7 @@ In this implementation .Fn memcpy is implemented using .Xr bcopy 3 , -and therefore the strings may overlap. -On other systems, copying overlapping strings may produce surprises. +and therefore the buffers may overlap. +On other systems, copying overlapping buffers may produce surprises. A simpler solution is to not use .Fn memcpy . diff --git a/src/lib/libc/string/memmove.3 b/src/lib/libc/string/memmove.3 index 64d491c6..d4a364eb 100644 --- a/src/lib/libc/string/memmove.3 +++ b/src/lib/libc/string/memmove.3 @@ -29,14 +29,14 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $OpenBSD: memmove.3,v 1.5 2003/06/02 20:18:38 millert Exp $ +.\" $OpenBSD: memmove.3,v 1.6 2003/06/21 12:04:01 avsm Exp $ .\" .Dd June 29, 1991 .Dt MEMMOVE 3 .Os .Sh NAME .Nm memmove -.Nd copy byte string +.Nd copy bytes .Sh SYNOPSIS .Fd #include .Ft void * @@ -46,11 +46,11 @@ The .Fn memmove function copies .Fa len -bytes from string +bytes from buffer .Fa src -to string +to buffer .Fa dst . -The two strings may overlap; +The two buffers may overlap; the copy is always done in a non-destructive manner. .Sh RETURN VALUES The