diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-12-02 00:20:51 +0100 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-12-10 16:09:53 +0100 |
| commit | 82a87d043498eeacb7e4f3edc85d1b7c424ea853 (patch) | |
| tree | 60d3978b0722d23f01da47eb534ec6fa271b3ed8 /isofs | |
| parent | 0a4ada8d40fb687a659161ff7e0d1d0994264402 (diff) | |
Replace `bcopy' with `memcpy' or `memmove' as appropriate
* ext2fs/inode.c: Replace `bcopy' with `memcpy' or `memmove' as
appropriate.
* ext2fs/pager.c: Likewise.
* isofs/lookup.c: Likewise.
* isofs/main.c: Likewise.
* isofs/rr.c: Likewise.
* libdiskfs/file-get-trans.c: Likewise.
* libiohelp/return-buffer.c: Likewise.
* libpager/pagemap.c: Likewise.
* libpipe/pq.c: Likewise.
* libpipe/pq.h: Likewise.
* libstore/unzipstore.c: Likewise.
* mach-defpager/default_pager.c: Likewise.
* pfinet/ethernet.c: Likewise.
* pfinet/tunnel.c: Likewise.
* storeio/dev.c: Likewise.
Diffstat (limited to 'isofs')
| -rw-r--r-- | isofs/lookup.c | 4 | ||||
| -rw-r--r-- | isofs/main.c | 2 | ||||
| -rw-r--r-- | isofs/rr.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/isofs/lookup.c b/isofs/lookup.c index b5b814db..e51b9cb1 100644 --- a/isofs/lookup.c +++ b/isofs/lookup.c @@ -338,7 +338,7 @@ diskfs_get_directs (struct node *dp, (ouralloc ? (allocsize *= 2) : (allocsize = vm_page_size * 2)), 1); - bcopy ((void *) *data, (void *)newdata, datap - *data); + memcpy ((void *) newdata, (void *) *data, datap - *data); if (ouralloc) munmap (*data, allocsize / 2); @@ -374,7 +374,7 @@ diskfs_get_directs (struct node *dp, userp->d_type = DT_UNKNOWN; userp->d_reclen = reclen; userp->d_namlen = namlen; - bcopy (name, userp->d_name, namlen); + memcpy (userp->d_name, name, namlen); userp->d_name[namlen] = '\0'; /* And move along */ diff --git a/isofs/main.c b/isofs/main.c index 5d002aff..4f531f7e 100644 --- a/isofs/main.c +++ b/isofs/main.c @@ -101,7 +101,7 @@ read_sblock () sblock = malloc (sizeof (struct sblock)); if (!sblock) error (1, errno, "Could not allocate memory for superblock"); - bcopy (sb, sblock, sizeof (struct sblock)); + memcpy (sblock, sb, sizeof (struct sblock)); diskfs_end_catch_exception (); /* Parse some important bits of this */ @@ -282,7 +282,7 @@ rrip_work (struct dirrect *dr, struct rrip_lookup *rr, nmbuf = realloc (nmbuf, (nmbufsize += nmlen) + 1); assert (nmbuf); - bcopy (nm->name, nmbuf + nmbufsize - nmlen, nmlen); + memcpy (nmbuf + nmbufsize - nmlen, nm->name, nmlen); if (nm->flags & NAME_CONTINUE) goto next_field; @@ -375,7 +375,7 @@ rrip_work (struct dirrect *dr, struct rrip_lookup *rr, rr->target = realloc (rr->target, targalloced *= 2); assert (rr->target); - bcopy (cname, rr->target + targused, cnamelen); + memcpy (rr->target + targused, cname, cnamelen); targused += cnamelen; } @@ -391,7 +391,7 @@ rrip_work (struct dirrect *dr, struct rrip_lookup *rr, slbuf = realloc (slbuf, slbufsize += crlen); assert (slbuf); - bcopy (sl->data, slbuf + slbufsize - crlen, crlen); + memcpy (slbuf + slbufsize - crlen, sl->data, crlen); if (sl->flags & 1) /* We'll finish later. */ |