diff options
| author | Jeremy Allison <jra@samba.org> | 2002-02-26 17:40:43 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-02-26 17:40:43 +0000 |
| commit | 62299aa7475bad48ba3e230596f09e794c2b4ce5 (patch) | |
| tree | 7ef38a07a3d7279135e23af343cc4a828e454ac3 /source3/libsmb | |
| parent | 97d96862ca84f599ee6fed0910389e07d46ee91d (diff) | |
| download | samba-62299aa7475bad48ba3e230596f09e794c2b4ce5.tar.gz samba-62299aa7475bad48ba3e230596f09e794c2b4ce5.tar.bz2 samba-62299aa7475bad48ba3e230596f09e794c2b4ce5.zip | |
bcopy must DIE ! Stop people creeping use of bcopy back into the code
(and yes I know who you are..... :-).
Jeremy.
(This used to be commit 330b0df960329bcf4696b8fa4a7357e6c456f74e)
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/clidgram.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/libsmbclient.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/libsmb/clidgram.c b/source3/libsmb/clidgram.c index 0b07bc2c99..abade68b01 100644 --- a/source3/libsmb/clidgram.c +++ b/source3/libsmb/clidgram.c @@ -117,7 +117,7 @@ int cli_get_response(int dgram_sock, BOOL unique, char *mailslot, char *buf, int /* Copy the data to buffer, respecting sizes ... */ - bcopy(&dgram->data[92], buf, MIN(bufsiz, (dgram->datasize - 92))); + memset(buf, &dgram->data[92], MIN(bufsiz, (dgram->datasize - 92))); } else diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c index 67e95d09d7..01b4186553 100644 --- a/source3/libsmb/libsmbclient.c +++ b/source3/libsmb/libsmbclient.c @@ -1908,7 +1908,7 @@ struct smbc_dirent *smbc_readdir(unsigned int fd) /* Hmmm, do I even need to copy it? */ - bcopy(dirent, smbc_local_dirent, dirent->dirlen); /* Copy the dirent */ + memcpy(smbc_local_dirent, dirent, dirent->dirlen); /* Copy the dirent */ dirp = (struct smbc_dirent *)smbc_local_dirent; @@ -2000,7 +2000,7 @@ int smbc_getdents(unsigned int fd, struct smbc_dirent *dirp, int count) dirent = dir->dirent; - bcopy(dirent, ndir, reqd); /* Copy the data in ... */ + memcpy(ndir, dirent, reqd); /* Copy the data in ... */ ((struct smbc_dirent *)ndir)->comment = (char *)(&((struct smbc_dirent *)ndir)->name + dirent->namelen + 1); |