summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/libfuse/fuse.c8
-rw-r--r--lib/libfuse/fuse_ops.c20
-rw-r--r--lib/libfuse/fuse_opt.c4
-rw-r--r--sys/miscfs/fuse/fuse_device.c8
-rw-r--r--sys/miscfs/fuse/fuse_vfsops.c8
5 files changed, 24 insertions, 24 deletions
diff --git a/lib/libfuse/fuse.c b/lib/libfuse/fuse.c
index 73426e54351..065c38c0cb7 100644
--- a/lib/libfuse/fuse.c
+++ b/lib/libfuse/fuse.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fuse.c,v 1.43 2017/12/18 14:20:23 helg Exp $ */
+/* $OpenBSD: fuse.c,v 1.44 2018/05/15 11:57:32 helg Exp $ */
/*
* Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com>
*
@@ -296,7 +296,7 @@ fuse_mount(const char *dir, struct fuse_args *args)
goto bad;
}
- bzero(&opts, sizeof(opts));
+ memset(&opts, 0, sizeof(opts));
if (fuse_opt_parse(args, &opts, fuse_mount_opts, NULL) == -1)
goto bad;
@@ -312,7 +312,7 @@ fuse_mount(const char *dir, struct fuse_args *args)
goto bad;
}
- bzero(&fargs, sizeof(fargs));
+ memset(&fargs, 0, sizeof(fargs));
fargs.fd = fc->fd;
fargs.max_read = opts.max_read;
@@ -567,7 +567,7 @@ fuse_parse_cmdline(struct fuse_args *args, char **mp, int *mt, int *fg)
{
struct fuse_core_opts opt;
- bzero(&opt, sizeof(opt));
+ memset(&opt, 0, sizeof(opt));
if (fuse_opt_parse(args, &opt, fuse_core_opts, ifuse_process_opt) == -1)
return (-1);
diff --git a/lib/libfuse/fuse_ops.c b/lib/libfuse/fuse_ops.c
index 395ce28573b..e322e81aa50 100644
--- a/lib/libfuse/fuse_ops.c
+++ b/lib/libfuse/fuse_ops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fuse_ops.c,v 1.28 2017/11/30 11:29:03 helg Exp $ */
+/* $OpenBSD: fuse_ops.c,v 1.29 2018/05/15 11:57:32 helg Exp $ */
/*
* Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com>
*
@@ -66,7 +66,7 @@ ifuse_ops_init(struct fuse *f)
DPRINTF("Opcode:\tinit\n");
if (f->op.init) {
- bzero(&fci, sizeof fci);
+ memset(&fci, 0, sizeof(fci));
fci.proto_minor = FUSE_MINOR_VERSION;
fci.proto_major = FUSE_MAJOR_VERSION;
@@ -139,7 +139,7 @@ ifuse_ops_open(struct fuse *f, struct fusebuf *fbuf)
CHECK_OPT(open);
- bzero(&ffi, sizeof(ffi));
+ memset(&ffi, 0, sizeof(ffi));
ffi.flags = fbuf->fb_io_flags;
vn = tree_get(&f->vnode_tree, fbuf->fb_ino);
@@ -277,7 +277,7 @@ ifuse_fill_getdir(fuse_dirh_t fd, const char *name, int type, ino_t ino)
{
struct stat st;
- bzero(&st, sizeof(st));
+ memset(&st, 0, sizeof(st));
st.st_mode = type << 12;
if (ino == 0)
st.st_ino = 0xffffffff;
@@ -302,7 +302,7 @@ ifuse_ops_readdir(struct fuse *f, struct fusebuf *fbuf)
DPRINTF("Offset:\t%llu\n", fbuf->fb_io_off);
DPRINTF("Size:\t%lu\n", fbuf->fb_io_len);
- bzero(&ffi, sizeof(ffi));
+ memset(&ffi, 0, sizeof(ffi));
ffi.fh = fbuf->fb_io_fd;
offset = fbuf->fb_io_off;
size = fbuf->fb_io_len;
@@ -376,7 +376,7 @@ ifuse_ops_releasedir(struct fuse *f, struct fusebuf *fbuf)
DPRINTF("Opcode:\treleasedir\n");
DPRINTF("Inode:\t%llu\n", (unsigned long long)fbuf->fb_ino);
- bzero(&ffi, sizeof(ffi));
+ memset(&ffi, 0, sizeof(ffi));
ffi.fh = fbuf->fb_io_fd;
ffi.fh_old = ffi.fh;
ffi.flags = fbuf->fb_io_flags;
@@ -413,7 +413,7 @@ ifuse_ops_release(struct fuse *f, struct fusebuf *fbuf)
CHECK_OPT(release);
- bzero(&ffi, sizeof(ffi));
+ memset(&ffi, 0, sizeof(ffi));
ffi.fh = fbuf->fb_io_fd;
ffi.fh_old = ffi.fh;
ffi.flags = fbuf->fb_io_flags;
@@ -496,7 +496,7 @@ ifuse_ops_read(struct fuse *f, struct fusebuf *fbuf)
CHECK_OPT(read);
- bzero(&ffi, sizeof(ffi));
+ memset(&ffi, 0, sizeof(ffi));
ffi.fh = fbuf->fb_io_fd;
size = fbuf->fb_io_len;
offset = fbuf->fb_io_off;
@@ -546,7 +546,7 @@ ifuse_ops_write(struct fuse *f, struct fusebuf *fbuf)
CHECK_OPT(write);
- bzero(&ffi, sizeof(ffi));
+ memset(&ffi, 0, sizeof(ffi));
ffi.fh = fbuf->fb_io_fd;
ffi.fh_old = ffi.fh;
ffi.writepage = fbuf->fb_io_flags & 1;
@@ -721,7 +721,7 @@ ifuse_ops_statfs(struct fuse *f, struct fusebuf *fbuf)
struct fuse_vnode *vn;
char *realname;
- bzero(&fbuf->fb_stat, sizeof(fbuf->fb_stat));
+ memset(&fbuf->fb_stat, 0, sizeof(fbuf->fb_stat));
CHECK_OPT(statfs);
diff --git a/lib/libfuse/fuse_opt.c b/lib/libfuse/fuse_opt.c
index c422d85b079..38bf34a7d15 100644
--- a/lib/libfuse/fuse_opt.c
+++ b/lib/libfuse/fuse_opt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fuse_opt.c,v 1.25 2017/12/15 16:40:33 jca Exp $ */
+/* $OpenBSD: fuse_opt.c,v 1.26 2018/05/15 11:57:32 helg Exp $ */
/*
* Copyright (c) 2013 Sylvestre Gallon <ccna.syl@gmail.com>
* Copyright (c) 2013 Stefan Sperling <stsp@openbsd.org>
@@ -275,7 +275,7 @@ fuse_opt_parse(struct fuse_args *args, void *data,
if (!args || !args->argc || !args->argv)
return (0);
- bzero(&outargs, sizeof(outargs));
+ memset(&outargs, 0, sizeof(outargs));
fuse_opt_add_arg(&outargs, args->argv[0]);
for (i = 1; i < args->argc; i++) {
diff --git a/sys/miscfs/fuse/fuse_device.c b/sys/miscfs/fuse/fuse_device.c
index 5bbde357c98..51953bbacda 100644
--- a/sys/miscfs/fuse/fuse_device.c
+++ b/sys/miscfs/fuse/fuse_device.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fuse_device.c,v 1.24 2018/01/22 13:16:48 helg Exp $ */
+/* $OpenBSD: fuse_device.c,v 1.25 2018/05/15 11:57:32 helg Exp $ */
/*
* Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com>
*
@@ -101,11 +101,11 @@ fuse_dump_buff(char *buff, int len)
return;
}
- bzero(text, 17);
+ memset(text, 0, 17);
for (i = 0; i < len; i++) {
if (i != 0 && (i % 16) == 0) {
printf(": %s\n", text);
- bzero(text, 17);
+ memset(text, 0, 17);
}
printf("%.2x ", buff[i] & 0xff);
@@ -438,7 +438,7 @@ fuseread(dev_t dev, struct uio *uio, int ioflag)
/* Do not send kernel pointers */
memcpy(&hdr.fh_next, &fbuf->fb_next, sizeof(fbuf->fb_next));
- bzero(&fbuf->fb_next, sizeof(fbuf->fb_next));
+ memset(&fbuf->fb_next, 0, sizeof(fbuf->fb_next));
tmpaddr = fbuf->fb_dat;
fbuf->fb_dat = NULL;
error = uiomove(fbuf, FUSEBUFSIZE, uio);
diff --git a/sys/miscfs/fuse/fuse_vfsops.c b/sys/miscfs/fuse/fuse_vfsops.c
index ac4c7e5f1cf..61396f580e2 100644
--- a/sys/miscfs/fuse/fuse_vfsops.c
+++ b/sys/miscfs/fuse/fuse_vfsops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fuse_vfsops.c,v 1.34 2018/04/27 10:13:37 mpi Exp $ */
+/* $OpenBSD: fuse_vfsops.c,v 1.35 2018/05/15 11:57:32 helg Exp $ */
/*
* Copyright (c) 2012-2013 Sylvestre Gallon <ccna.syl@gmail.com>
*
@@ -109,11 +109,11 @@ fusefs_mount(struct mount *mp, const char *path, void *data,
mp->mnt_flag |= MNT_LOCAL;
vfs_getnewfsid(mp);
- bzero(mp->mnt_stat.f_mntonname, MNAMELEN);
+ memset(mp->mnt_stat.f_mntonname, 0, MNAMELEN);
strlcpy(mp->mnt_stat.f_mntonname, path, MNAMELEN);
- bzero(mp->mnt_stat.f_mntfromname, MNAMELEN);
+ memset(mp->mnt_stat.f_mntfromname, 0, MNAMELEN);
strlcpy(mp->mnt_stat.f_mntfromname, "fusefs", MNAMELEN);
- bzero(mp->mnt_stat.f_mntfromspec, MNAMELEN);
+ memset(mp->mnt_stat.f_mntfromspec, 0, MNAMELEN);
strlcpy(mp->mnt_stat.f_mntfromspec, "fusefs", MNAMELEN);
fuse_device_set_fmp(fmp, 1);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 17:11:41 +0000