diff options
| author | joerg <joerg> | 2008-02-07 16:14:44 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2008-02-07 16:14:44 +0000 |
| commit | cbab315db6cf1b7ded55ccab040f4bbb6b1b7357 (patch) | |
| tree | a2e47eb5e97feb043a90421bade9e0077e172669 /net | |
| parent | 77ac25c9ee09179fc431b0b3131b2d1edf0e7f8b (diff) | |
| download | pkgsrc-cbab315db6cf1b7ded55ccab040f4bbb6b1b7357.tar.gz | |
bcopy -> memcpy
Diffstat (limited to 'net')
| -rw-r--r-- | net/libfetch/files/common.c | 4 | ||||
| -rw-r--r-- | net/libfetch/files/ftp.c | 10 | ||||
| -rw-r--r-- | net/libfetch/files/http.c | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/net/libfetch/files/common.c b/net/libfetch/files/common.c index e091b7ddd08..91019fef6b2 100644 --- a/net/libfetch/files/common.c +++ b/net/libfetch/files/common.c @@ -1,4 +1,4 @@ -/* $NetBSD: common.c,v 1.1.1.1 2008/02/07 01:48:22 joerg Exp $ */ +/* $NetBSD: common.c,v 1.2 2008/02/07 16:14:44 joerg Exp $ */ /*- * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav * All rights reserved. @@ -642,7 +642,7 @@ fetch_add_entry(struct url_ent **p, int *size, int *len, tmp = *p + *len; snprintf(tmp->name, PATH_MAX, "%s", name); - bcopy(us, &tmp->stat, sizeof(*us)); + memcpy(&tmp->stat, us, sizeof(*us)); (*len)++; (++tmp)->name[0] = 0; diff --git a/net/libfetch/files/ftp.c b/net/libfetch/files/ftp.c index 5970fd4b090..1dad23aa02d 100644 --- a/net/libfetch/files/ftp.c +++ b/net/libfetch/files/ftp.c @@ -1,4 +1,4 @@ -/* $NetBSD: ftp.c,v 1.1.1.1 2008/02/07 01:48:22 joerg Exp $ */ +/* $NetBSD: ftp.c,v 1.2 2008/02/07 16:14:44 joerg Exp $ */ /*- * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav * All rights reserved. @@ -746,8 +746,8 @@ ftp_transfer(conn_t *conn, const char *oper, const char *file, if (e == FTP_EPASSIVE_MODE) sin6->sin6_port = htons(port); else { - bcopy(addr + 2, (char *)&sin6->sin6_addr, 16); - bcopy(addr + 19, (char *)&sin6->sin6_port, 2); + memcpy(&sin6->sin6_addr, addr + 2, 16); + memcpy(&sin6->sin6_port, addr + 19, 2); } break; case AF_INET: @@ -755,8 +755,8 @@ ftp_transfer(conn_t *conn, const char *oper, const char *file, if (e == FTP_EPASSIVE_MODE) sin4->sin_port = htons(port); else { - bcopy(addr, (char *)&sin4->sin_addr, 4); - bcopy(addr + 4, (char *)&sin4->sin_port, 2); + memcpy(&sin4->sin_addr, addr, 4); + memcpy(&sin4->sin_port, addr + 4, 2); } break; default: diff --git a/net/libfetch/files/http.c b/net/libfetch/files/http.c index ee91ca52ea1..451d284bfc8 100644 --- a/net/libfetch/files/http.c +++ b/net/libfetch/files/http.c @@ -1,4 +1,4 @@ -/* $NetBSD: http.c,v 1.1.1.1 2008/02/07 01:48:23 joerg Exp $ */ +/* $NetBSD: http.c,v 1.2 2008/02/07 16:14:44 joerg Exp $ */ /*- * Copyright (c) 2000-2004 Dag-Erling Coïdan Smørgrav * All rights reserved. @@ -265,7 +265,7 @@ http_readfn(void *v, char *buf, int len) l = io->buflen - io->bufpos; if (len < l) l = len; - bcopy(io->buf + io->bufpos, buf + pos, l); + memcpy(buf + pos, io->buf + io->bufpos, l); io->bufpos += l; } |