From d8ee57f47143ae643c4aa70b40d3ed427e2f0dde Mon Sep 17 00:00:00 2001 From: mav Date: Wed, 9 Oct 2013 19:02:59 +0000 Subject: [PATCH] MFC r250131 (by eadler): Correct a few sizeof()s git-svn-id: svn://svn.freebsd.org/base/stable/9@256217 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/cam/ctl/ctl_frontend_internal.c | 2 +- sys/net/if_spppsubr.c | 2 +- sys/netpfil/ipfw/ip_dummynet.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/cam/ctl/ctl_frontend_internal.c b/sys/cam/ctl/ctl_frontend_internal.c index 9b25a70bd..870d072cd 100644 --- a/sys/cam/ctl/ctl_frontend_internal.c +++ b/sys/cam/ctl/ctl_frontend_internal.c @@ -253,7 +253,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 7c9c23090..d029e918f 100644 --- a/sys/net/if_spppsubr.c +++ b/sys/net/if_spppsubr.c @@ -3619,7 +3619,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 b6950211e..c1b228177 100644 --- a/sys/netpfil/ipfw/ip_dummynet.c +++ b/sys/netpfil/ipfw/ip_dummynet.c @@ -617,7 +617,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 { -- 2.45.0