CVS commit: src/sys

[Joerg Sonnenberger]

Module Name:    src
Committed By:   joerg
Date:           Mon Jul  4 16:06:18 UTC 2011

Modified Files:
        src/sys/dev/ic: ncr53c9x.c rtw.c
        src/sys/opencrypto: cryptodev.c

Log Message:
Fix memset usage.


To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/dev/ic/ncr53c9x.c
cvs rdiff -u -r1.118 -r1.119 src/sys/dev/ic/rtw.c
cvs rdiff -u -r1.67 -r1.68 src/sys/opencrypto/cryptodev.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/ic/ncr53c9x.c
diff -u src/sys/dev/ic/ncr53c9x.c:1.141 src/sys/dev/ic/ncr53c9x.c:1.142
--- src/sys/dev/ic/ncr53c9x.c:1.141	Mon Sep  7 13:31:44 2009
+++ src/sys/dev/ic/ncr53c9x.c	Mon Jul  4 16:06:17 2011
@@ -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);
 		}

Index: src/sys/dev/ic/rtw.c
diff -u src/sys/dev/ic/rtw.c:1.118 src/sys/dev/ic/rtw.c:1.119
--- src/sys/dev/ic/rtw.c:1.118	Mon Nov 15 05:56:29 2010
+++ src/sys/dev/ic/rtw.c	Mon Jul  4 16:06:17 2011
@@ -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++) {

Index: src/sys/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.67 src/sys/opencrypto/cryptodev.c:1.68
--- src/sys/opencrypto/cryptodev.c:1.67	Thu Jun  9 14:41:24 2011
+++ src/sys/opencrypto/cryptodev.c	Mon Jul  4 16:06:17 2011
@@ -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);