diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2017-06-12 13:49:57 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2017-06-12 13:49:57 +0000 |
| commit | 83b6064de17f154d0b7d9d3355d5c745bd812104 (patch) | |
| tree | 92f2e1e802e6897e3e8ba48a03ecc2c4c86ff756 /usr.sbin/makefs | |
| parent | d5c2c66dba17a9584ff6d8c929bc198a3468f87f (diff) | |
| download | src-83b6064de17f154d0b7d9d3355d5c745bd812104.tar.gz src-83b6064de17f154d0b7d9d3355d5c745bd812104.zip | |
makefs: use C standard memcpy/memset in userland
This file does not exist in NetBSD's makefs, but make the chance for
consistency with memcpy/memset used in the rest of makefs.
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=319853
Diffstat (limited to 'usr.sbin/makefs')
| -rw-r--r-- | usr.sbin/makefs/mtree.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/makefs/mtree.c b/usr.sbin/makefs/mtree.c index 0dcb45173123..69d3f516ea56 100644 --- a/usr.sbin/makefs/mtree.c +++ b/usr.sbin/makefs/mtree.c @@ -455,7 +455,7 @@ create_node(const char *name, u_int type, fsnode *parent, fsnode *global) n->inode = ecalloc(1, sizeof(*n->inode)); /* Assign global options/defaults. */ - bcopy(global->inode, n->inode, sizeof(*n->inode)); + memcpy(n->inode, global->inode, sizeof(*n->inode)); n->inode->st.st_mode = (n->inode->st.st_mode & ~S_IFMT) | n->type; if (n->type == S_IFLNK) @@ -1041,8 +1041,8 @@ read_mtree(const char *fname, fsnode *node) if (error) goto out; - bzero(&mtree_global, sizeof(mtree_global)); - bzero(&mtree_global_inode, sizeof(mtree_global_inode)); + memset(&mtree_global, 0, sizeof(mtree_global)); + memset(&mtree_global_inode, 0, sizeof(mtree_global_inode)); mtree_global.inode = &mtree_global_inode; mtree_global_inode.nlink = 1; mtree_global_inode.st.st_nlink = 1; |