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 /ext2fs | |
| 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 'ext2fs')
| -rw-r--r-- | ext2fs/inode.c | 6 | ||||
| -rw-r--r-- | ext2fs/pager.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ext2fs/inode.c b/ext2fs/inode.c index 27530fbe..6b8b7499 100644 --- a/ext2fs/inode.c +++ b/ext2fs/inode.c @@ -733,7 +733,7 @@ diskfs_set_translator (struct node *np, const char *name, unsigned namelen, buf[0] = namelen & 0xFF; buf[1] = (namelen >> 8) & 0xFF; - bcopy (name, buf + 2, namelen); + memcpy (buf + 2, name, namelen); blkptr = disk_cache_block_ref (blkno); memcpy (blkptr, buf, block_size); @@ -805,7 +805,7 @@ write_symlink (struct node *node, const char *target) assert (node->dn_stat.st_blocks == 0); - bcopy (target, node->dn->info.i_data, len); + memcpy (node->dn->info.i_data, target, len); node->dn_stat.st_size = len - 1; node->dn_set_ctime = 1; node->dn_set_mtime = 1; @@ -822,7 +822,7 @@ read_symlink (struct node *node, char *target) assert (node->dn_stat.st_size < MAX_INODE_SYMLINK); - bcopy (node->dn->info.i_data, target, node->dn_stat.st_size); + memcpy (target, node->dn->info.i_data, node->dn_stat.st_size); return 0; } diff --git a/ext2fs/pager.c b/ext2fs/pager.c index ae515305..a6c4fbb5 100644 --- a/ext2fs/pager.c +++ b/ext2fs/pager.c @@ -209,7 +209,7 @@ file_pager_read_page (struct node *node, vm_offset_t page, else /* We've already got some buffer, so copy into it. */ { - bcopy (new_buf, *buf + offs, new_len); + memcpy (*buf + offs, new_buf, new_len); free_page_buf (new_buf); /* Return NEW_BUF to our pool. */ STAT_INC (file_pagein_freed_bufs); } @@ -316,7 +316,7 @@ pending_blocks_write (struct pending_blocks *pb) /* Put what we're going to write into a page-aligned buffer. */ { void *page_buf = get_page_buf (); - bcopy (pb->buf + pb->offs, (void *)page_buf, length); + memcpy ((void *)page_buf, pb->buf + pb->offs, length); err = store_write (store, dev_block, page_buf, length, &amount); free_page_buf (page_buf); } |