diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2006-01-30 07:35:34 +0000 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2006-01-30 07:35:34 +0000 |
| commit | 9de494dadb01c932c5d5dc0a6316dc7f028aace9 (patch) | |
| tree | 11dbe0f0697e73ad4794874b54426f6efd6a276a | |
| parent | 514c861a1dc349d81c12ce4cf3bba769a2d7281b (diff) | |
Change the only bcopy user to memmove and remove internal version of bcopy
| -rw-r--r-- | libc/inet/rpc/rcmd.c | 8 | ||||
| -rw-r--r-- | libc/string/bcopy.c | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/libc/inet/rpc/rcmd.c b/libc/inet/rpc/rcmd.c index a479b89ca..4ba3eb5cf 100644 --- a/libc/inet/rpc/rcmd.c +++ b/libc/inet/rpc/rcmd.c @@ -93,7 +93,7 @@ libc_hidden_proto(strcpy) libc_hidden_proto(strlen) libc_hidden_proto(strncmp) libc_hidden_proto(strnlen) -libc_hidden_proto(bcopy) +libc_hidden_proto(memmove) libc_hidden_proto(getpid) libc_hidden_proto(socket) libc_hidden_proto(close) @@ -230,7 +230,7 @@ int rcmd(ahost, rport, locuser, remuser, cmd, fd2p) } fcntl(s, F_SETOWN, pid); sin.sin_family = hp->h_addrtype; - bcopy(hp->h_addr_list[0], &sin.sin_addr, + memmove(&sin.sin_addr, hp->h_addr_list[0], MIN (sizeof (sin.sin_addr), hp->h_length)); sin.sin_port = rport; if (connect(s, (struct sockaddr *)&sin, sizeof(sin)) >= 0) /* __connect */ @@ -253,7 +253,7 @@ int rcmd(ahost, rport, locuser, remuser, cmd, fd2p) __set_errno (oerrno); perror(0); hp->h_addr_list++; - bcopy(hp->h_addr_list[0], &sin.sin_addr, + memmove(&sin.sin_addr, hp->h_addr_list[0], MIN (sizeof (sin.sin_addr), hp->h_length)); (void)fprintf(stderr, "Trying %s...\n", inet_ntoa(sin.sin_addr)); @@ -423,7 +423,7 @@ int ruserok(rhost, superuser, ruser, luser) } #endif for (ap = hp->h_addr_list; *ap; ++ap) { - bcopy(*ap, &addr, sizeof(addr)); + memmove(&addr, *ap, sizeof(addr)); if (iruserok2(addr, superuser, ruser, luser, rhost) == 0) return 0; } diff --git a/libc/string/bcopy.c b/libc/string/bcopy.c index 7e4f2328a..11c3e8015 100644 --- a/libc/string/bcopy.c +++ b/libc/string/bcopy.c @@ -7,7 +7,6 @@ #include "_string.h" -libc_hidden_proto(bcopy) libc_hidden_proto(memmove) void bcopy(const void *s2, void *s1, size_t n) @@ -52,4 +51,3 @@ void bcopy(const void *s2, void *s1, size_t n) #endif #endif } -libc_hidden_def(bcopy) |