From 9b9f7c3cacc1d220962fab1b910c6d76e2cd8087 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Sun, 8 Jul 2012 18:20:12 -0700 Subject: Convert remaining bcopy() calls to memcpy() Signed-off-by: Alan Coopersmith Reviewed-by: Mark Kettenis --- common.c | 2 +- fd.c | 2 +- server.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common.c b/common.c index 980c4c7..5951519 100644 --- a/common.c +++ b/common.c @@ -278,7 +278,7 @@ SetUpConnectionSocket(int iport, void (*connectionFunc) (int)) if (hp == NULL) panic("No address for our host"); - bcopy((char *) hp->h_addr, (char *) &sin.sin_addr, hp->h_length); + memcpy(&sin.sin_addr, hp->h_addr, hp->h_length); } /* new code -- INADDR_ANY should be better than using the name of the host machine. The host machine may have several different network diff --git a/fd.c b/fd.c index 3d3a863..4ee9a3e 100644 --- a/fd.c +++ b/fd.c @@ -330,7 +330,7 @@ MakeConnection(const char *server, short port, int report, debug(1, (stderr, "gethostbyname failed for %s\n", server)); panic("Can't open connection to Server"); } - bcopy((char *) hp->h_addr, (char *) &sin.sin_addr, hp->h_length); + memcpy(&sin.sin_addr, hp->h_addr, hp->h_length); } sin.sin_family = AF_INET; diff --git a/server.c b/server.c index efeae56..3369460 100644 --- a/server.c +++ b/server.c @@ -203,9 +203,9 @@ SaveBytes(FD fd, const unsigned char *buf, long n) } /* now copy the new bytes onto the end of the old bytes */ - bcopy(/* from */ buf, - /* to */ (CS[fd].SavedBytes + CS[fd].NumberofSavedBytes), - /* count */ n); + memcpy(/* to */ (CS[fd].SavedBytes + CS[fd].NumberofSavedBytes), + /* from */ buf, + /* count */ n); CS[fd].NumberofSavedBytes += n; } -- cgit v1.2.1