summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreadler <eadler@FreeBSD.org>2013-05-01 04:37:34 +0000
committereadler <eadler@FreeBSD.org>2013-05-01 04:37:34 +0000
commita5a9ec51d6e8b0b33f89b8e4b171a2fd674818ed (patch)
tree396d6c04700211e454e3f5330392c42ea64a54cc
parent95ff9c17485fd7a6e0d684d343b68274504f93c4 (diff)
downloadFreeBSD-src-a5a9ec51d6e8b0b33f89b8e4b171a2fd674818ed.zip
FreeBSD-src-a5a9ec51d6e8b0b33f89b8e4b171a2fd674818ed.tar.gz
Correct a few sizeof()s
Submitted by: swildner@DragonFlyBSD.org Reviewed by: alfred
-rw-r--r--sys/arm/broadcom/bcm2835/bcm2835_dma.c2
-rw-r--r--sys/cam/ctl/ctl_frontend_internal.c2
-rw-r--r--sys/net/if_spppsubr.c2
-rw-r--r--sys/netpfil/ipfw/ip_dummynet.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_dma.c b/sys/arm/broadcom/bcm2835/bcm2835_dma.c
index 429ba7c..08f3835 100644
--- a/sys/arm/broadcom/bcm2835/bcm2835_dma.c
+++ b/sys/arm/broadcom/bcm2835/bcm2835_dma.c
@@ -198,7 +198,7 @@ bcm_dma_reset(device_t dev, int ch)
/* Reset control block */
cb = sc->sc_dma_ch[ch].cb;
- bzero(cb, sizeof(cb));
+ bzero(cb, sizeof(*cb));
cb->info = INFO_WAIT_RESP;
}
diff --git a/sys/cam/ctl/ctl_frontend_internal.c b/sys/cam/ctl/ctl_frontend_internal.c
index 0c1ec27..87762f0 100644
--- a/sys/cam/ctl/ctl_frontend_internal.c
+++ b/sys/cam/ctl/ctl_frontend_internal.c
@@ -248,7 +248,7 @@ cfi_init(void)
sizeof(struct cfi_lun_io),
CTL_PORT_PRIV_SIZE);
}
- memset(softc, 0, sizeof(softc));
+ memset(softc, 0, sizeof(*softc));
mtx_init(&softc->lock, "CTL frontend mutex", NULL, MTX_DEF);
softc->flags |= CTL_FLAG_MASTER_SHELF;
diff --git a/sys/net/if_spppsubr.c b/sys/net/if_spppsubr.c
index 1c6399f..7255545 100644
--- a/sys/net/if_spppsubr.c
+++ b/sys/net/if_spppsubr.c
@@ -3596,7 +3596,7 @@ sppp_ipv6cp_RCR(struct sppp *sp, struct lcp_header *h, int len)
continue;
}
- bzero(&suggestaddr, sizeof(&suggestaddr));
+ bzero(&suggestaddr, sizeof(suggestaddr));
if (collision && nohisaddr) {
/* collision, hisaddr unknown - Conf-Rej */
type = CONF_REJ;
diff --git a/sys/netpfil/ipfw/ip_dummynet.c b/sys/netpfil/ipfw/ip_dummynet.c
index 1f25af5..429f2f1 100644
--- a/sys/netpfil/ipfw/ip_dummynet.c
+++ b/sys/netpfil/ipfw/ip_dummynet.c
@@ -618,7 +618,7 @@ fsk_detach(struct dn_fsk *fs, int flags)
fs->sched->fp->free_fsk(fs);
fs->sched = NULL;
if (flags & DN_DELETE_FS) {
- bzero(fs, sizeof(fs)); /* safety */
+ bzero(fs, sizeof(*fs)); /* safety */
free(fs, M_DUMMYNET);
dn_cfg.fsk_count--;
} else {
OpenPOWER on IntegriCloud