Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Fix memset usage.



details:   https://anonhg.NetBSD.org/src/rev/7516ed4278cc
branches:  trunk
changeset: 766944:7516ed4278cc
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon Jul 04 16:06:17 2011 +0000

description:
Fix memset usage.

diffstat:

 sys/dev/ccd.c              |  6 +++---
 sys/dev/ic/ncr53c9x.c      |  6 +++---
 sys/dev/ic/rtw.c           |  6 +++---
 sys/opencrypto/cryptodev.c |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diffs (108 lines):

diff -r b0d1b982ff7a -r 7516ed4278cc sys/dev/ccd.c
--- a/sys/dev/ccd.c     Mon Jul 04 15:46:09 2011 +0000
+++ b/sys/dev/ccd.c     Mon Jul 04 16:06:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ccd.c,v 1.140 2011/06/21 06:23:38 jruoho Exp $ */
+/*     $NetBSD: ccd.c,v 1.141 2011/07/04 16:06:45 joerg Exp $  */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.140 2011/06/21 06:23:38 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.141 2011/07/04 16:06:45 joerg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -290,7 +290,7 @@
                /*
                 * Copy in the pathname of the component.
                 */
-               memset(tmppath, 0, sizeof(tmppath));    /* sanity */
+               memset(tmppath, 0, MAXPATHLEN); /* sanity */
                error = copyinstr(cpaths[ix], tmppath,
                    MAXPATHLEN, &ci->ci_pathlen);
                if (ci->ci_pathlen == 0)
diff -r b0d1b982ff7a -r 7516ed4278cc sys/dev/ic/ncr53c9x.c
--- a/sys/dev/ic/ncr53c9x.c     Mon Jul 04 15:46:09 2011 +0000
+++ b/sys/dev/ic/ncr53c9x.c     Mon Jul 04 16:06:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr53c9x.c,v 1.141 2009/09/07 13:31:44 tsutsui Exp $   */
+/*     $NetBSD: ncr53c9x.c,v 1.142 2011/07/04 16:06:17 joerg Exp $     */
 
 /*-
  * Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.141 2009/09/07 13:31:44 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ncr53c9x.c,v 1.142 2011/07/04 16:06:17 joerg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -511,7 +511,7 @@
 
                TAILQ_INIT(&sc->ready_list);
                sc->sc_nexus = NULL;
-               memset(sc->sc_tinfo, 0, sizeof(sc->sc_tinfo));
+               memset(sc->sc_tinfo, 0, sizeof(*sc->sc_tinfo));
                for (r = 0; r < sc->sc_ntarg; r++) {
                        LIST_INIT(&sc->sc_tinfo[r].luns);
                }
diff -r b0d1b982ff7a -r 7516ed4278cc sys/dev/ic/rtw.c
--- a/sys/dev/ic/rtw.c  Mon Jul 04 15:46:09 2011 +0000
+++ b/sys/dev/ic/rtw.c  Mon Jul 04 16:06:17 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rtw.c,v 1.118 2010/11/15 05:56:29 uebayasi Exp $ */
+/* $NetBSD: rtw.c,v 1.119 2011/07/04 16:06:17 joerg Exp $ */
 /*-
  * Copyright (c) 2004, 2005, 2006, 2007 David Young.  All rights
  * reserved.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.118 2010/11/15 05:56:29 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtw.c,v 1.119 2011/07/04 16:06:17 joerg Exp $");
 
 
 #include <sys/param.h>
@@ -640,7 +640,7 @@
        regs = &sc->sc_regs;
        rk = &sc->sc_keys;
 
-       (void)memset(rk, 0, sizeof(rk));
+       (void)memset(rk, 0, sizeof(*rk));
 
        /* Temporarily use software crypto for all keys. */
        for (i = 0; i < IEEE80211_WEP_NKID; i++) {
diff -r b0d1b982ff7a -r 7516ed4278cc sys/opencrypto/cryptodev.c
--- a/sys/opencrypto/cryptodev.c        Mon Jul 04 15:46:09 2011 +0000
+++ b/sys/opencrypto/cryptodev.c        Mon Jul 04 16:06:17 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cryptodev.c,v 1.67 2011/06/09 14:41:24 drochner Exp $ */
+/*     $NetBSD: cryptodev.c,v 1.68 2011/07/04 16:06:17 joerg Exp $ */
 /*     $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $        */
 /*     $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $   */
 
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.67 2011/06/09 14:41:24 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.68 2011/07/04 16:06:17 joerg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -2029,7 +2029,7 @@
 {
        struct fcrypt *fcr = fp->f_data;
 
-       (void)memset(st, 0, sizeof(st));
+       (void)memset(st, 0, sizeof(*st));
 
        mutex_enter(&crypto_mtx);
        st->st_dev = makedev(cdevsw_lookup_major(&crypto_cdevsw), fcr->sesn);



Home | Main Index | Thread Index | Old Index