Module Name: src
Committed By: cegger
Date: Sat May 16 16:52:03 UTC 2009
Modified Files:
src/sys/arch/i386/i386: bios32.c
src/sys/arch/i386/pci: glxsb.c
Log Message:
KNF, same object code generated.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/i386/bios32.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/pci/glxsb.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/arch/i386/i386/bios32.c
diff -u src/sys/arch/i386/i386/bios32.c:1.25 src/sys/arch/i386/i386/bios32.c:1.26
--- src/sys/arch/i386/i386/bios32.c:1.25 Wed Mar 18 17:06:44 2009
+++ src/sys/arch/i386/i386/bios32.c Sat May 16 16:52:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: bios32.c,v 1.25 2009/03/18 17:06:44 cegger Exp $ */
+/* $NetBSD: bios32.c,v 1.26 2009/05/16 16:52:03 cegger Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bios32.c,v 1.25 2009/03/18 17:06:44 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bios32.c,v 1.26 2009/05/16 16:52:03 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -327,7 +327,7 @@
if (i == indx) {
if (va + len < end) {
ret = dest;
- memcpy( ret, va, len);
+ memcpy(ret, va, len);
ret[len - 1] = '\0';
}
}
Index: src/sys/arch/i386/pci/glxsb.c
diff -u src/sys/arch/i386/pci/glxsb.c:1.8 src/sys/arch/i386/pci/glxsb.c:1.9
--- src/sys/arch/i386/pci/glxsb.c:1.8 Wed Mar 18 17:06:44 2009
+++ src/sys/arch/i386/pci/glxsb.c Sat May 16 16:52:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: glxsb.c,v 1.8 2009/03/18 17:06:44 cegger Exp $ */
+/* $NetBSD: glxsb.c,v 1.9 2009/05/16 16:52:03 cegger Exp $ */
/* $OpenBSD: glxsb.c,v 1.7 2007/02/12 14:31:45 tom Exp $ */
/*
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: glxsb.c,v 1.8 2009/03/18 17:06:44 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: glxsb.c,v 1.9 2009/05/16 16:52:03 cegger Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -331,7 +331,7 @@
if (ses == NULL)
return (ENOMEM);
if (sesn != 0) {
- memcpy( ses, sc->sc_sessions, sesn * sizeof(*ses));
+ memcpy(ses, sc->sc_sessions, sesn * sizeof(*ses));
memset(sc->sc_sessions, 0, sesn * sizeof(*ses));
free(sc->sc_sessions, M_DEVBUF);
}
@@ -347,7 +347,7 @@
ses->ses_klen = cri->cri_klen;
/* Copy the key (Geode LX wants the primary key only) */
- memcpy( ses->ses_key, cri->cri_key, sizeof(ses->ses_key));
+ memcpy(ses->ses_key, cri->cri_key, sizeof(ses->ses_key));
*sidp = GLXSB_SID(0, sesn);
return (0);
@@ -492,9 +492,9 @@
if (crd->crd_flags & CRD_F_ENCRYPT) {
control = SB_CTL_ENC;
if (crd->crd_flags & CRD_F_IV_EXPLICIT)
- memcpy( op_iv, crd->crd_iv, sizeof(op_iv));
+ memcpy(op_iv, crd->crd_iv, sizeof(op_iv));
else
- memcpy( op_iv, ses->ses_iv, sizeof(op_iv));
+ memcpy(op_iv, ses->ses_iv, sizeof(op_iv));
if ((crd->crd_flags & CRD_F_IV_PRESENT) == 0) {
if (crp->crp_flags & CRYPTO_F_IMBUF)
@@ -511,7 +511,7 @@
} else {
control = SB_CTL_DEC;
if (crd->crd_flags & CRD_F_IV_EXPLICIT)
- memcpy( op_iv, crd->crd_iv, sizeof(op_iv));
+ memcpy(op_iv, crd->crd_iv, sizeof(op_iv));
else {
if (crp->crp_flags & CRYPTO_F_IMBUF)
m_copydata((struct mbuf *)crp->crp_buf,
@@ -557,7 +557,7 @@
cuio_copyback((struct uio *)crp->crp_buf,
crd->crd_skip + offset, len, op_dst);
else
- memcpy( (char *)crp->crp_buf + crd->crd_skip + offset, op_dst,
+ memcpy((char *)crp->crp_buf + crd->crd_skip + offset, op_dst,
len);
offset += len;
@@ -576,11 +576,11 @@
* time.
*/
if (crd->crd_flags & CRD_F_ENCRYPT) {
- memcpy( piv, op_dst + len - sizeof(op_iv), sizeof(op_iv));
+ memcpy(piv, op_dst + len - sizeof(op_iv), sizeof(op_iv));
} else {
/* Decryption, only need this if another iteration */
if (tlen > 0) {
- memcpy( piv, op_src + len - sizeof(op_iv),
+ memcpy(piv, op_src + len - sizeof(op_iv),
sizeof(op_iv));
}
}