summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/compat/linux/linux_cdrom.c6
-rw-r--r--sys/compat/linux/linux_signal.c8
-rw-r--r--sys/kern/exec_elf.c6
-rw-r--r--sys/kern/kern_event.c8
-rw-r--r--sys/kern/kern_exec.c4
-rw-r--r--sys/kern/kern_ktrace.c10
-rw-r--r--sys/kern/kern_lkm.c4
-rw-r--r--sys/kern/kern_lock.c4
-rw-r--r--sys/kern/kern_malloc.c6
-rw-r--r--sys/kern/kern_resource.c4
-rw-r--r--sys/kern/kern_rwlock.c4
-rw-r--r--sys/kern/kern_sig.c6
-rw-r--r--sys/kern/kern_sysctl.c12
-rw-r--r--sys/kern/subr_disk.c22
-rw-r--r--sys/kern/subr_extent.c4
-rw-r--r--sys/kern/subr_hibernate.c12
-rw-r--r--sys/kern/subr_log.c4
-rw-r--r--sys/kern/subr_userconf.c6
-rw-r--r--sys/kern/sys_generic.c6
-rw-r--r--sys/kern/sys_pipe.c6
-rw-r--r--sys/kern/sys_process.c8
-rw-r--r--sys/kern/vfs_subr.c4
-rw-r--r--sys/kern/vfs_syscalls.c4
23 files changed, 79 insertions, 79 deletions
diff --git a/sys/compat/linux/linux_cdrom.c b/sys/compat/linux/linux_cdrom.c
index 38385553335..7c74d8d91b0 100644
--- a/sys/compat/linux/linux_cdrom.c
+++ b/sys/compat/linux/linux_cdrom.c
@@ -1,5 +1,5 @@
-/* $OpenBSD: linux_cdrom.c,v 1.9 2012/04/22 05:43:14 guenther Exp $ */
+/* $OpenBSD: linux_cdrom.c,v 1.10 2014/01/21 01:49:13 tedu Exp $ */
/*
* Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
* All rights reserved.
@@ -137,7 +137,7 @@ linux_ioctl_cdrom(p, v, retval)
sg = stackgap_init(p->p_emul);
- bzero(&tmpb.tes, sizeof tmpb.tes);
+ memset(&tmpb.tes, 0, sizeof tmpb.tes);
tmpb.tes.starting_track = tmpl.te.cdte_track;
tmpb.tes.address_format = (tmpl.te.cdte_format == LINUX_CDROM_MSF)
? CD_MSF_FORMAT : CD_LBA_FORMAT;
@@ -166,7 +166,7 @@ linux_ioctl_cdrom(p, v, retval)
sg = stackgap_init(p->p_emul);
- bzero(&tmpb.sc, sizeof tmpb.sc);
+ memset(&tmpb.sc, 0, sizeof tmpb.sc);
tmpb.sc.data_format = CD_CURRENT_POSITION;
tmpb.sc.address_format = (tmpl.sc.cdsc_format == LINUX_CDROM_MSF)
? CD_MSF_FORMAT : CD_LBA_FORMAT;
diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c
index 67af421caef..af5666317f7 100644
--- a/sys/compat/linux/linux_signal.c
+++ b/sys/compat/linux/linux_signal.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: linux_signal.c,v 1.15 2012/06/19 11:35:29 pirofti Exp $ */
+/* $OpenBSD: linux_signal.c,v 1.16 2014/01/21 01:49:13 tedu Exp $ */
/* $NetBSD: linux_signal.c,v 1.10 1996/04/04 23:51:36 christos Exp $ */
/*
@@ -53,13 +53,13 @@
#include <compat/linux/linux_syscallargs.h>
#include <compat/linux/linux_util.h>
-#define sigemptyset(s) bzero((s), sizeof(*(s)))
+#define sigemptyset(s) memset((s), 0, sizeof(*(s)))
#define sigismember(s, n) (*(s) & sigmask(n))
#define sigaddset(s, n) (*(s) |= sigmask(n))
/* Locally used defines (in bsd<->linux conversion functions): */
#define linux_sigmask(n) (1 << ((n) - 1))
-#define linux_sigemptyset(s) bzero((s), sizeof(*(s)))
+#define linux_sigemptyset(s) memset((s), 0, sizeof(*(s)))
#define linux_sigismember(s, n) ((s)->sig[((n) - 1) / LINUX__NSIG_BPW] \
& (1 << ((n) - 1) % LINUX__NSIG_BPW))
#define linux_sigaddset(s, n) ((s)->sig[((n) - 1) / LINUX__NSIG_BPW] \
@@ -333,7 +333,7 @@ bsd_to_linux_sigaction(bsa, lsa)
{
/* Clear sa_flags and sa_restorer (if it exists) */
- bzero(lsa, sizeof(struct linux_sigaction));
+ memset(lsa, 0, sizeof(struct linux_sigaction));
/* ...and fill in the mask and flags */
bsd_to_linux_sigset(&bsa->sa_mask, &lsa->sa_mask);
diff --git a/sys/kern/exec_elf.c b/sys/kern/exec_elf.c
index bd959e3da25..8b6f0720965 100644
--- a/sys/kern/exec_elf.c
+++ b/sys/kern/exec_elf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: exec_elf.c,v 1.93 2013/07/04 17:37:05 tedu Exp $ */
+/* $OpenBSD: exec_elf.c,v 1.94 2014/01/21 01:48:44 tedu Exp $ */
/*
* Copyright (c) 1996 Per Fogelstrom
@@ -891,7 +891,7 @@ ELFNAME(os_pt_note)(struct proc *p, struct exec_package *epp, Elf_Ehdr *eh,
np->descsz != desc_size)
goto out3;
- if (bcmp((np + 1), os_name, name_size))
+ if (memcmp((np + 1), os_name, name_size))
goto out3;
/* XXX: We could check for the specific emulation here */
@@ -1149,7 +1149,7 @@ ELFNAMEEND(coredump_notes)(struct proc *p, void *iocookie, size_t *sizep)
notesize = sizeof(nhdr) + elfround(sizeof("OpenBSD")) +
elfround(sizeof(cpi));
if (iocookie) {
- bzero(&cpi, sizeof(cpi));
+ memset(&cpi, 0, sizeof(cpi));
cpi.cpi_version = ELFCORE_PROCINFO_VERSION;
cpi.cpi_cpisize = sizeof(cpi);
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index b7f2c8fe5cc..d8fc6f3dc37 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_event.c,v 1.53 2013/11/14 18:09:39 chl Exp $ */
+/* $OpenBSD: kern_event.c,v 1.54 2014/01/21 01:48:44 tedu Exp $ */
/*-
* Copyright (c) 1999,2000,2001 Jonathan Lemon <jlemon@FreeBSD.org>
@@ -867,7 +867,7 @@ kqueue_stat(struct file *fp, struct stat *st, struct proc *p)
{
struct kqueue *kq = (struct kqueue *)fp->f_data;
- bzero((void *)st, sizeof(*st));
+ memset(st, 0, sizeof(*st));
st->st_size = kq->kq_count;
st->st_blksize = sizeof(struct kevent);
st->st_mode = S_IFIFO;
@@ -1023,8 +1023,8 @@ knote_attach(struct knote *kn, struct filedesc *fdp)
list = malloc(size * sizeof(struct klist), M_TEMP, M_WAITOK);
bcopy((caddr_t)fdp->fd_knlist, (caddr_t)list,
fdp->fd_knlistsize * sizeof(struct klist));
- bzero((caddr_t)list +
- fdp->fd_knlistsize * sizeof(struct klist),
+ memset((caddr_t)list +
+ fdp->fd_knlistsize * sizeof(struct klist), 0,
(size - fdp->fd_knlistsize) * sizeof(struct klist));
if (fdp->fd_knlist != NULL)
free(fdp->fd_knlist, M_TEMP);
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 4c1bed189b2..68b237ef786 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_exec.c,v 1.136 2014/01/20 03:23:42 guenther Exp $ */
+/* $OpenBSD: kern_exec.c,v 1.137 2014/01/21 01:48:44 tedu Exp $ */
/* $NetBSD: kern_exec.c,v 1.75 1996/02/09 18:59:28 christos Exp $ */
/*-
@@ -472,7 +472,7 @@ sys_execve(struct proc *p, void *v, register_t *retval)
TCB_SET(p, NULL); /* reset the TCB address */
/* set command name & other accounting info */
- bzero(p->p_comm, sizeof(p->p_comm));
+ memset(p->p_comm, 0, sizeof(p->p_comm));
len = min(nid.ni_cnd.cn_namelen, MAXCOMLEN);
bcopy(nid.ni_cnd.cn_nameptr, p->p_comm, len);
pr->ps_acflag &= ~AFORK;
diff --git a/sys/kern/kern_ktrace.c b/sys/kern/kern_ktrace.c
index da050c9e7fd..8d3960f61e0 100644
--- a/sys/kern/kern_ktrace.c
+++ b/sys/kern/kern_ktrace.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_ktrace.c,v 1.62 2014/01/20 21:19:28 guenther Exp $ */
+/* $OpenBSD: kern_ktrace.c,v 1.63 2014/01/21 01:48:44 tedu Exp $ */
/* $NetBSD: kern_ktrace.c,v 1.23 1996/02/09 18:59:36 christos Exp $ */
/*
@@ -120,7 +120,7 @@ ktrsettrace(struct process *pr, int facs, struct vnode *newvp,
void
ktrinitheader(struct ktr_header *kth, struct proc *p, int type)
{
- bzero(kth, sizeof (struct ktr_header));
+ memset(kth, 0, sizeof(struct ktr_header));
kth->ktr_type = type;
nanotime(&kth->ktr_time);
kth->ktr_pid = p->p_p->ps_pid;
@@ -133,7 +133,7 @@ ktrstart(struct proc *p, struct vnode *vp, struct ucred *cred)
{
struct ktr_header kth;
- bzero(&kth, sizeof (kth));
+ memset(&kth, 0, sizeof(kth));
kth.ktr_type = htobe32(KTR_START);
nanotime(&kth.ktr_time);
kth.ktr_pid = (pid_t)-1;
@@ -173,7 +173,7 @@ ktrsyscall(struct proc *p, register_t code, size_t argsize, register_t args[])
if (code == SYS___sysctl && (p->p_emul->e_flags & EMUL_NATIVE) &&
nargs &&
copyin((void *)args[0], argp, nargs * sizeof(int)))
- bzero(argp, nargs * sizeof(int));
+ memset(argp, 0, nargs * sizeof(int));
kth.ktr_len = len;
ktrwrite(p, &kth, ktp);
free(ktp, M_TEMP);
@@ -369,7 +369,7 @@ ktruser(struct proc *p, const char *id, const void *addr, size_t len)
ktp = (struct ktr_user *)memp;
} else
ktp = (struct ktr_user *)stkbuf;
- bzero(ktp->ktr_id, KTR_USER_MAXIDLEN);
+ memset(ktp->ktr_id, 0, KTR_USER_MAXIDLEN);
error = copyinstr(id, ktp->ktr_id, KTR_USER_MAXIDLEN, NULL);
if (error)
goto out;
diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c
index b971a7c4c43..e19a5f7a876 100644
--- a/sys/kern/kern_lkm.c
+++ b/sys/kern/kern_lkm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_lkm.c,v 1.46 2010/01/14 23:12:11 schwarze Exp $ */
+/* $OpenBSD: kern_lkm.c,v 1.47 2014/01/21 01:48:44 tedu Exp $ */
/* $NetBSD: kern_lkm.c,v 1.31 1996/03/31 21:40:27 christos Exp $ */
/*
@@ -443,7 +443,7 @@ lkmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct proc *p)
case LKMS_LOADING_SYMS:
if ((curp->size - curp->offset) > 0)
/* The remainder must be bss, so we clear it */
- bzero((caddr_t)curp->area + curp->offset,
+ memset((caddr_t)curp->area + curp->offset, 0,
curp->size - curp->offset);
break;
default:
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c
index c87cb9a3a51..cef4c7c7664 100644
--- a/sys/kern/kern_lock.c
+++ b/sys/kern/kern_lock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_lock.c,v 1.42 2013/05/06 16:37:55 tedu Exp $ */
+/* $OpenBSD: kern_lock.c,v 1.43 2014/01/21 01:48:44 tedu Exp $ */
/*
* Copyright (c) 1995
@@ -54,7 +54,7 @@ lockinit(struct lock *lkp, int prio, char *wmesg, int timo, int flags)
{
KASSERT(flags == 0);
- bzero(lkp, sizeof(struct lock));
+ memset(lkp, 0, sizeof(struct lock));
rrw_init(&lkp->lk_lck, wmesg);
}
diff --git a/sys/kern/kern_malloc.c b/sys/kern/kern_malloc.c
index e0bd779b13c..5afe208f3b9 100644
--- a/sys/kern/kern_malloc.c
+++ b/sys/kern/kern_malloc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_malloc.c,v 1.103 2013/08/08 23:25:06 syl Exp $ */
+/* $OpenBSD: kern_malloc.c,v 1.104 2014/01/21 01:48:44 tedu Exp $ */
/* $NetBSD: kern_malloc.c,v 1.15.4.2 1996/06/13 17:10:56 cgd Exp $ */
/*
@@ -586,7 +586,7 @@ sysctl_malloc(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
/* Initialize the first time */
if (buckstring_init == 0) {
buckstring_init = 1;
- bzero(buckstring, sizeof(buckstring));
+ memset(buckstring, 0, sizeof(buckstring));
for (siz = 0, i = MINBUCKET; i < MINBUCKET + 16; i++) {
snprintf(buckstring + siz,
sizeof buckstring - siz,
@@ -601,7 +601,7 @@ sysctl_malloc(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
case KERN_MALLOC_BUCKET:
bcopy(&bucket[BUCKETINDX(name[1])], &kb, sizeof(kb));
- bzero(&kb.kb_freelist, sizeof(kb.kb_freelist));
+ memset(&kb.kb_freelist, 0, sizeof(kb.kb_freelist));
return (sysctl_rdstruct(oldp, oldlenp, newp, &kb, sizeof(kb)));
case KERN_MALLOC_KMEMSTATS:
#ifdef KMEMSTATS
diff --git a/sys/kern/kern_resource.c b/sys/kern/kern_resource.c
index 6a6100da684..ef26fa57864 100644
--- a/sys/kern/kern_resource.c
+++ b/sys/kern/kern_resource.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_resource.c,v 1.47 2014/01/20 21:19:28 guenther Exp $ */
+/* $OpenBSD: kern_resource.c,v 1.48 2014/01/21 01:48:44 tedu Exp $ */
/* $NetBSD: kern_resource.c,v 1.38 1996/10/23 07:19:38 matthias Exp $ */
/*-
@@ -446,7 +446,7 @@ dogetrusage(struct proc *p, int who, struct rusage *rup)
if (pr->ps_ru != NULL)
*rup = *pr->ps_ru;
else
- bzero(rup, sizeof(*rup));
+ memset(rup, 0, sizeof(*rup));
/* add on all living threads */
TAILQ_FOREACH(q, &pr->ps_threads, p_thr_link) {
diff --git a/sys/kern/kern_rwlock.c b/sys/kern/kern_rwlock.c
index 27ad632e806..a472b616400 100644
--- a/sys/kern/kern_rwlock.c
+++ b/sys/kern/kern_rwlock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_rwlock.c,v 1.20 2013/05/06 16:37:55 tedu Exp $ */
+/* $OpenBSD: kern_rwlock.c,v 1.21 2014/01/21 01:48:44 tedu Exp $ */
/*
* Copyright (c) 2002, 2003 Artur Grabowski <art@openbsd.org>
@@ -293,7 +293,7 @@ rw_assert_unlocked(struct rwlock *rwl)
void
rrw_init(struct rrwlock *rrwl, char *name)
{
- bzero(rrwl, sizeof(struct rrwlock));
+ memset(rrwl, 0, sizeof(struct rrwlock));
rw_init(&rrwl->rrwl_lock, name);
}
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index a1b210e3f3e..9e16570c21c 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_sig.c,v 1.156 2014/01/20 21:19:28 guenther Exp $ */
+/* $OpenBSD: kern_sig.c,v 1.157 2014/01/21 01:48:44 tedu Exp $ */
/* $NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $ */
/*
@@ -1674,7 +1674,7 @@ sys___thrsigdivert(struct proc *p, void *v, register_t *retval)
} else {
siginfo_t si;
- bzero(&si, sizeof si);
+ memset(&si, 0, sizeof(si));
si.si_signo = p->p_sigwait;
error = copyout(&si, SCARG(uap, info), sizeof(si));
}
@@ -1684,7 +1684,7 @@ sys___thrsigdivert(struct proc *p, void *v, register_t *retval)
void
initsiginfo(siginfo_t *si, int sig, u_long trapno, int code, union sigval val)
{
- bzero(si, sizeof *si);
+ memset(si, 0, sizeof(*si));
si->si_signo = sig;
si->si_code = code;
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index 2e36b845fee..05d18a40d1c 100644
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kern_sysctl.c,v 1.243 2014/01/20 21:19:28 guenther Exp $ */
+/* $OpenBSD: kern_sysctl.c,v 1.244 2014/01/21 01:48:44 tedu Exp $ */
/* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */
/*-
@@ -466,7 +466,7 @@ kern_sysctl(int *name, u_int namelen, void *oldp, size_t *oldlenp, void *newp,
struct cpu_info *ci;
int i;
- bzero(cp_time, sizeof(cp_time));
+ memset(cp_time, 0, sizeof(cp_time));
CPU_INFO_FOREACH(cii, ci) {
for (i = 0; i < CPUSTATES; i++)
@@ -1858,8 +1858,8 @@ sysctl_diskinit(int update, struct proc *p)
for (dk = TAILQ_FIRST(&disklist), i = 0, l = 0; dk;
dk = TAILQ_NEXT(dk, dk_link), i++) {
dl = dk->dk_label;
- bzero(duid, sizeof(duid));
- if (dl && bcmp(dl->d_uid, &uid, sizeof(dl->d_uid))) {
+ memset(duid, 0, sizeof(duid));
+ if (dl && memcmp(dl->d_uid, &uid, sizeof(dl->d_uid))) {
snprintf(duid, sizeof(duid),
"%02hx%02hx%02hx%02hx"
"%02hx%02hx%02hx%02hx",
@@ -2007,7 +2007,7 @@ sysctl_sysvipc(int *name, u_int namelen, void *where, size_t *sizep)
bcopy(sema[i], &semsi->semids[i],
dssize);
else
- bzero(&semsi->semids[i], dssize);
+ memset(&semsi->semids[i], 0, dssize);
break;
#endif
#ifdef SYSVSHM
@@ -2016,7 +2016,7 @@ sysctl_sysvipc(int *name, u_int namelen, void *where, size_t *sizep)
bcopy(shmsegs[i], &shmsi->shmids[i],
dssize);
else
- bzero(&shmsi->shmids[i], dssize);
+ memset(&shmsi->shmids[i], 0, dssize);
break;
#endif
}
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index fccc90c1a58..afc7464615b 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_disk.c,v 1.159 2013/11/20 23:52:42 dlg Exp $ */
+/* $OpenBSD: subr_disk.c,v 1.160 2014/01/21 01:48:44 tedu Exp $ */
/* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */
/*
@@ -571,15 +571,15 @@ setdisklabel(struct disklabel *olp, struct disklabel *nlp, u_int openmask)
/* Generate a UID if the disklabel does not already have one. */
uid = 0;
- if (bcmp(nlp->d_uid, &uid, sizeof(nlp->d_uid)) == 0) {
+ if (memcmp(nlp->d_uid, &uid, sizeof(nlp->d_uid)) == 0) {
do {
arc4random_buf(nlp->d_uid, sizeof(nlp->d_uid));
TAILQ_FOREACH(dk, &disklist, dk_link)
- if (dk->dk_label && bcmp(dk->dk_label->d_uid,
+ if (dk->dk_label && memcmp(dk->dk_label->d_uid,
nlp->d_uid, sizeof(nlp->d_uid)) == 0)
break;
} while (dk != NULL &&
- bcmp(nlp->d_uid, &uid, sizeof(nlp->d_uid)) == 0);
+ memcmp(nlp->d_uid, &uid, sizeof(nlp->d_uid)) == 0);
}
nlp->d_checksum = 0;
@@ -1102,8 +1102,8 @@ setroot(struct device *bootdv, int part, int exitflags)
}
/* Locate DUID for boot disk if not already provided. */
- bzero(duid, sizeof(duid));
- if (bcmp(bootduid, duid, sizeof(bootduid)) == 0) {
+ memset(duid, 0, sizeof(duid));
+ if (memcmp(bootduid, duid, sizeof(bootduid)) == 0) {
TAILQ_FOREACH(dk, &disklist, dk_link)
if (dk->dk_device == bootdv)
break;
@@ -1219,11 +1219,11 @@ gotswap:
rootdv = bootdv;
if (bootdv->dv_class == DV_DISK) {
- bzero(&duid, sizeof(duid));
- if (bcmp(rootduid, &duid, sizeof(rootduid)) != 0) {
+ memset(&duid, 0, sizeof(duid));
+ if (memcmp(rootduid, &duid, sizeof(rootduid)) != 0) {
TAILQ_FOREACH(dk, &disklist, dk_link)
if ((dk->dk_flags & DKF_LABELVALID) &&
- dk->dk_label && bcmp(dk->dk_label->d_uid,
+ dk->dk_label && memcmp(dk->dk_label->d_uid,
&rootduid, sizeof(rootduid)) == 0)
break;
if (dk == NULL)
@@ -1439,7 +1439,7 @@ disk_map(char *path, char *mappath, int size, int flags)
return -1;
/* Derive label UID. */
- bzero(uid, sizeof(uid));
+ memset(uid, 0, sizeof(uid));
for (i = 0; i < 16; i++) {
c = path[i];
if (c >= '0' && c <= '9')
@@ -1456,7 +1456,7 @@ disk_map(char *path, char *mappath, int size, int flags)
mdk = NULL;
TAILQ_FOREACH(dk, &disklist, dk_link) {
if ((dk->dk_flags & DKF_LABELVALID) && dk->dk_label &&
- bcmp(dk->dk_label->d_uid, uid,
+ memcmp(dk->dk_label->d_uid, uid,
sizeof(dk->dk_label->d_uid)) == 0) {
/* Fail if there are duplicate UIDs! */
if (mdk != NULL)
diff --git a/sys/kern/subr_extent.c b/sys/kern/subr_extent.c
index 98b52baab84..65449463750 100644
--- a/sys/kern/subr_extent.c
+++ b/sys/kern/subr_extent.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_extent.c,v 1.48 2013/08/08 23:25:06 syl Exp $ */
+/* $OpenBSD: subr_extent.c,v 1.49 2014/01/21 01:48:44 tedu Exp $ */
/* $NetBSD: subr_extent.c,v 1.7 1996/11/21 18:46:34 cgd Exp $ */
/*-
@@ -188,7 +188,7 @@ extent_create(char *name, u_long start, u_long end, int mtype, caddr_t storage,
if (fixed_extent) {
struct extent_fixed *fex;
- bzero(storage, storagesize);
+ memset(storage, 0, storagesize);
/*
* Align all descriptors on "long" boundaries.
diff --git a/sys/kern/subr_hibernate.c b/sys/kern/subr_hibernate.c
index c4ff1564d23..09e9f397498 100644
--- a/sys/kern/subr_hibernate.c
+++ b/sys/kern/subr_hibernate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_hibernate.c,v 1.82 2014/01/14 09:57:51 mlarkin Exp $ */
+/* $OpenBSD: subr_hibernate.c,v 1.83 2014/01/21 01:48:44 tedu Exp $ */
/*
* Copyright (c) 2011 Ariane van der Steldt <ariane@stack.nl>
@@ -680,7 +680,7 @@ get_hibernate_info(union hibernate_info *hib, int suspend)
chunktable_size = HIBERNATE_CHUNK_TABLE_SIZE / DEV_BSIZE;
/* Stash kernel version information */
- bzero(&hib->kernel_version, 128);
+ memset(&hib->kernel_version, 0, 128);
bcopy(version, &hib->kernel_version,
min(strlen(version), sizeof(hib->kernel_version)-1));
@@ -942,7 +942,7 @@ hibernate_clear_signature(void)
union hibernate_info hib;
/* Zero out a blank hiber_info */
- bzero(&blank_hiber_info, sizeof(union hibernate_info));
+ memset(&blank_hiber_info, 0, sizeof(union hibernate_info));
/* Get the signature block location */
if (get_hibernate_info(&hib, 0))
@@ -1099,7 +1099,7 @@ hibernate_resume(void)
int s;
/* Get current running machine's hibernate info */
- bzero(&hib, sizeof(hib));
+ memset(&hib, 0, sizeof(hib));
if (get_hibernate_info(&hib, 0)) {
DPRINTF("couldn't retrieve machine's hibernate info\n");
return;
@@ -1536,8 +1536,8 @@ hibernate_zlib_reset(union hibernate_info *hib, int deflate)
hibernate_zlib_start = (vaddr_t)(pva + (28 * PAGE_SIZE));
hibernate_zlib_size = 80 * PAGE_SIZE;
- bzero((caddr_t)hibernate_zlib_start, hibernate_zlib_size);
- bzero((caddr_t)hibernate_state, PAGE_SIZE);
+ memset((void *)hibernate_zlib_start, 0, hibernate_zlib_size);
+ memset(hibernate_state, 0, PAGE_SIZE);
/* Set up stream structure */
hibernate_state->hib_stream.zalloc = (alloc_func)hibernate_zlib_alloc;
diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c
index 84fa91dcba9..ae0a2a8eaf9 100644
--- a/sys/kern/subr_log.c
+++ b/sys/kern/subr_log.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_log.c,v 1.17 2011/07/02 22:20:08 nicm Exp $ */
+/* $OpenBSD: subr_log.c,v 1.18 2014/01/21 01:48:44 tedu Exp $ */
/* $NetBSD: subr_log.c,v 1.11 1996/03/30 22:24:44 christos Exp $ */
/*
@@ -94,7 +94,7 @@ initmsgbuf(caddr_t buf, size_t bufsize)
* internally inconsistent, initialize it.
*/
- bzero(buf, bufsize);
+ memset(buf, 0, bufsize);
mbp->msg_magic = MSG_MAGIC;
mbp->msg_bufs = new_bufs;
}
diff --git a/sys/kern/subr_userconf.c b/sys/kern/subr_userconf.c
index aa405b6aec4..eeb530f4e12 100644
--- a/sys/kern/subr_userconf.c
+++ b/sys/kern/subr_userconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_userconf.c,v 1.38 2013/12/12 20:56:01 guenther Exp $ */
+/* $OpenBSD: subr_userconf.c,v 1.39 2014/01/21 01:48:44 tedu Exp $ */
/*
* Copyright (c) 1996-2001 Mats O Jansson <moj@stacken.kth.se>
@@ -507,7 +507,7 @@ userconf_change(int devno)
userconf_hist_int(cd->cf_flags);
if (share) {
- if (bcmp(cd->cf_loc, lk, sizeof(int) * i))
+ if (memcmp(cd->cf_loc, lk, sizeof(int) * i))
cd->cf_loc = lk;
else
free(lk, M_TEMP);
@@ -1040,7 +1040,7 @@ userconf_add(char *dev, int len, short unit, short state)
struct cfdata new;
int val, max_unit, star_unit, orig;
- bzero(&new, sizeof(struct cfdata));
+ memset(&new, 0, sizeof(struct cfdata));
if (userconf_maxdev == userconf_totdev) {
printf("No more space for new devices.\n");
diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c
index f02b6cafac6..09fac32bd96 100644
--- a/sys/kern/sys_generic.c
+++ b/sys/kern/sys_generic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys_generic.c,v 1.84 2013/09/14 02:28:02 guenther Exp $ */
+/* $OpenBSD: sys_generic.c,v 1.85 2014/01/21 01:48:45 tedu Exp $ */
/* $NetBSD: sys_generic.c,v 1.24 1996/03/29 00:25:32 cgd Exp $ */
/*
@@ -448,7 +448,7 @@ sys_ioctl(struct proc *p, void *v, register_t *retval)
* Zero the buffer so the user always
* gets back something deterministic.
*/
- bzero(data, size);
+ memset(data, 0, size);
else if (com&IOC_VOID)
*(caddr_t *)data = SCARG(uap, data);
@@ -624,7 +624,7 @@ dopselect(struct proc *p, int nd, fd_set *in, fd_set *ou, fd_set *ex,
pobits[1] = (fd_set *)&mbits[ni * 4];
pobits[2] = (fd_set *)&mbits[ni * 5];
} else {
- bzero(bits, sizeof(bits));
+ memset(bits, 0, sizeof(bits));
pibits[0] = (fd_set *)&bits[0];
pibits[1] = (fd_set *)&bits[1];
pibits[2] = (fd_set *)&bits[2];
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index 20cb0bbcb3c..bda5911d86a 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys_pipe.c,v 1.63 2012/05/06 09:45:26 mikeb Exp $ */
+/* $OpenBSD: sys_pipe.c,v 1.64 2014/01/21 01:48:45 tedu Exp $ */
/*
* Copyright (c) 1996 John S. Dyson
@@ -207,7 +207,7 @@ pipe_create(struct pipe *cpipe)
* protect so pipeclose() doesn't follow a junk pointer
* if pipespace() fails.
*/
- bzero(&cpipe->pipe_sel, sizeof cpipe->pipe_sel);
+ memset(&cpipe->pipe_sel, 0, sizeof(cpipe->pipe_sel));
cpipe->pipe_state = 0;
cpipe->pipe_peer = NULL;
cpipe->pipe_busy = 0;
@@ -683,7 +683,7 @@ pipe_stat(struct file *fp, struct stat *ub, struct proc *p)
{
struct pipe *pipe = (struct pipe *)fp->f_data;
- bzero(ub, sizeof(*ub));
+ memset(ub, 0, sizeof(*ub));
ub->st_mode = S_IFIFO;
ub->st_blksize = pipe->pipe_buffer.size;
ub->st_size = pipe->pipe_buffer.cnt;
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index b36da4fb13d..f23171157f8 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sys_process.c,v 1.57 2012/04/13 19:20:31 kettenis Exp $ */
+/* $OpenBSD: sys_process.c,v 1.58 2014/01/21 01:48:45 tedu Exp $ */
/* $NetBSD: sys_process.c,v 1.55 1996/05/15 06:17:47 tls Exp $ */
/*-
@@ -341,7 +341,7 @@ sys_ptrace(struct proc *p, void *v, register_t *retval)
if (tr->ps_ptstat == NULL)
tr->ps_ptstat = malloc(sizeof(*tr->ps_ptstat),
M_SUBPROC, M_WAITOK);
- bzero(tr->ps_ptstat, sizeof(*tr->ps_ptstat));
+ memset(tr->ps_ptstat, 0, sizeof(*tr->ps_ptstat));
return (0);
case PT_WRITE_I: /* XXX no separate I and D spaces */
@@ -500,7 +500,7 @@ sys_ptrace(struct proc *p, void *v, register_t *retval)
atomic_clearbits_int(&tr->ps_flags, PS_TRACED|PS_WAITED);
sendsig:
- bzero(tr->ps_ptstat, sizeof(*tr->ps_ptstat));
+ memset(tr->ps_ptstat, 0, sizeof(*tr->ps_ptstat));
/* Finally, deliver the requested signal (or none). */
if (t->p_stat == SSTOP) {
@@ -549,7 +549,7 @@ sys_ptrace(struct proc *p, void *v, register_t *retval)
case PT_GET_EVENT_MASK:
if (SCARG(uap, data) != sizeof(pe))
return (EINVAL);
- bzero(&pe, sizeof(pe));
+ memset(&pe, 0, sizeof(pe));
pe.pe_set_event = tr->ps_ptmask;
return (copyout(&pe, SCARG(uap, addr), sizeof(pe)));
case PT_SET_EVENT_MASK:
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 308dd9470e9..ca729adaae6 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_subr.c,v 1.210 2013/12/01 16:40:56 krw Exp $ */
+/* $OpenBSD: vfs_subr.c,v 1.211 2014/01/21 01:48:45 tedu Exp $ */
/* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */
/*
@@ -525,7 +525,7 @@ loop:
nvp->v_specnext = *vpp;
nvp->v_specmountpoint = NULL;
nvp->v_speclockf = NULL;
- bzero(nvp->v_specbitmap, sizeof(nvp->v_specbitmap));
+ memset(nvp->v_specbitmap, 0, sizeof(nvp->v_specbitmap));
*vpp = nvp;
if (vp != NULLVP) {
nvp->v_flag |= VALIASED;
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index fbe9a140eff..e76f391cabd 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_syscalls.c,v 1.201 2014/01/20 03:33:29 guenther Exp $ */
+/* $OpenBSD: vfs_syscalls.c,v 1.202 2014/01/21 01:48:45 tedu Exp $ */
/* $NetBSD: vfs_syscalls.c,v 1.71 1996/04/23 10:29:02 mycroft Exp $ */
/*
@@ -958,7 +958,7 @@ sys_getfh(struct proc *p, void *v, register_t *retval)
if (error)
return (error);
vp = nd.ni_vp;
- bzero(&fh, sizeof(fh));
+ memset(&fh, 0, sizeof(fh));
fh.fh_fsid = vp->v_mount->mnt_stat.f_fsid;
error = VFS_VPTOFH(vp, &fh.fh_fid);
vput(vp);
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.