Module Name: src
Committed By: mbalmer
Date: Tue Jan 5 13:30:11 UTC 2010
Modified Files:
src/sys/dev/ic: isp.c isp_library.c mvsata.c
src/sys/fs/nilfs: nilfs_vnops.c
src/sys/fs/sysvbfs: sysvbfs_vnops.c
src/sys/fs/udf: udf_subr.c udf_vnops.c
Log Message:
Remove extra semicolons.
To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/dev/ic/isp.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/isp_library.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/ic/mvsata.c
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/nilfs/nilfs_vnops.c
cvs rdiff -u -r1.24 -r1.25 src/sys/fs/sysvbfs/sysvbfs_vnops.c
cvs rdiff -u -r1.100 -r1.101 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.55 -r1.56 src/sys/fs/udf/udf_vnops.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/isp.c
diff -u src/sys/dev/ic/isp.c:1.118 src/sys/dev/ic/isp.c:1.119
--- src/sys/dev/ic/isp.c:1.118 Sun Jan 3 02:47:09 2010
+++ src/sys/dev/ic/isp.c Tue Jan 5 13:30:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: isp.c,v 1.118 2010/01/03 02:47:09 mjacob Exp $ */
+/* $NetBSD: isp.c,v 1.119 2010/01/05 13:30:10 mbalmer Exp $ */
/*
* Machine and OS Independent (well, as best as possible)
* code for the Qlogic ISP SCSI adapters.
@@ -43,7 +43,7 @@
*/
#ifdef __NetBSD__
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.118 2010/01/03 02:47:09 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp.c,v 1.119 2010/01/05 13:30:10 mbalmer Exp $");
#include <dev/ic/isp_netbsd.h>
#endif
#ifdef __FreeBSD__
@@ -6660,8 +6660,8 @@
ptr = isp->isp_mbxworkp;
switch (isp->isp_lastmbxcmd) {
case MBOX_WRITE_RAM_WORD:
- mbs.param[1] = isp->isp_mbxwrk1++;;
- mbs.param[2] = *ptr++;;
+ mbs.param[1] = isp->isp_mbxwrk1++;
+ mbs.param[2] = *ptr++;
break;
case MBOX_READ_RAM_WORD:
*ptr++ = isp->isp_mboxtmp[2];
@@ -6671,7 +6671,7 @@
offset = isp->isp_mbxwrk1;
offset |= isp->isp_mbxwrk8 << 16;
- mbs.param[2] = *ptr++;;
+ mbs.param[2] = *ptr++;
mbs.param[1] = offset;
mbs.param[8] = offset >> 16;
isp->isp_mbxwrk1 = ++offset;
Index: src/sys/dev/ic/isp_library.c
diff -u src/sys/dev/ic/isp_library.c:1.4 src/sys/dev/ic/isp_library.c:1.5
--- src/sys/dev/ic/isp_library.c:1.4 Thu Jun 25 23:44:02 2009
+++ src/sys/dev/ic/isp_library.c Tue Jan 5 13:30:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: isp_library.c,v 1.4 2009/06/25 23:44:02 mjacob Exp $ */
+/* $NetBSD: isp_library.c,v 1.5 2010/01/05 13:30:10 mbalmer Exp $ */
/*
* Copyright (c) 2006-2007 by Matthew Jacob
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#ifdef __NetBSD__
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isp_library.c,v 1.4 2009/06/25 23:44:02 mjacob Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isp_library.c,v 1.5 2010/01/05 13:30:10 mbalmer Exp $");
#include <dev/ic/isp_netbsd.h>
#endif
#ifdef __FreeBSD__
@@ -670,7 +670,7 @@
} else {
ct_entry_t *ctio = (ct_entry_t *) local;
ctio->ct_syshandle = handle & 0xffff;
- ctio->ct_status = CT_HBA_RESET & 0xff;;
+ ctio->ct_status = CT_HBA_RESET & 0xff;
ctio->ct_header.rqs_entry_type = RQSTYPE_CTIO;
}
isp_async(isp, ISPASYNC_TARGET_ACTION, local);
Index: src/sys/dev/ic/mvsata.c
diff -u src/sys/dev/ic/mvsata.c:1.2 src/sys/dev/ic/mvsata.c:1.3
--- src/sys/dev/ic/mvsata.c:1.2 Mon Aug 3 20:06:36 2009
+++ src/sys/dev/ic/mvsata.c Tue Jan 5 13:30:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: mvsata.c,v 1.2 2009/08/03 20:06:36 snj Exp $ */
+/* $NetBSD: mvsata.c,v 1.3 2010/01/05 13:30:10 mbalmer Exp $ */
/*
* Copyright (c) 2008 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.2 2009/08/03 20:06:36 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.3 2010/01/05 13:30:10 mbalmer Exp $");
#include "opt_mvsata.h"
@@ -325,7 +325,7 @@
#ifdef MVSATA_WITHOUTDMA
sc->sc_wdcdev.sc_atac.atac_cap |= ATAC_CAP_DATA16;
#else
- sc->sc_edma_setup_crqb = edma_setup_crqb;;
+ sc->sc_edma_setup_crqb = edma_setup_crqb;
sc->sc_wdcdev.sc_atac.atac_cap |=
(ATAC_CAP_DATA16 | ATAC_CAP_DMA | ATAC_CAP_UDMA);
#endif
Index: src/sys/fs/nilfs/nilfs_vnops.c
diff -u src/sys/fs/nilfs/nilfs_vnops.c:1.2 src/sys/fs/nilfs/nilfs_vnops.c:1.3
--- src/sys/fs/nilfs/nilfs_vnops.c:1.2 Wed Aug 26 03:40:48 2009
+++ src/sys/fs/nilfs/nilfs_vnops.c Tue Jan 5 13:30:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: nilfs_vnops.c,v 1.2 2009/08/26 03:40:48 elad Exp $ */
+/* $NetBSD: nilfs_vnops.c,v 1.3 2010/01/05 13:30:11 mbalmer Exp $ */
/*
* Copyright (c) 2008, 2009 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.2 2009/08/26 03:40:48 elad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nilfs_vnops.c,v 1.3 2010/01/05 13:30:11 mbalmer Exp $");
#endif /* not lint */
@@ -1406,7 +1406,7 @@
struct vnode *dvp = ap->a_dvp;
struct vnode *vp = ap->a_vp;
struct componentname *cnp = ap->a_cnp;
- struct nilfs_node *dir_node = VTOI(dvp);;
+ struct nilfs_node *dir_node = VTOI(dvp);
struct nilfs_node *nilfs_node = VTOI(vp);
struct nilfs_mount *ump = dir_node->ump;
int error;
@@ -1447,7 +1447,7 @@
struct vnode *vp = ap->a_vp;
struct vnode *dvp = ap->a_dvp;
struct componentname *cnp = ap->a_cnp;
- struct nilfs_node *dir_node = VTOI(dvp);;
+ struct nilfs_node *dir_node = VTOI(dvp);
struct nilfs_node *nilfs_node = VTOI(vp);
struct nilfs_mount *ump = dir_node->ump;
int refcnt, error;
Index: src/sys/fs/sysvbfs/sysvbfs_vnops.c
diff -u src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.24 src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.25
--- src/sys/fs/sysvbfs/sysvbfs_vnops.c:1.24 Fri Jul 3 22:38:08 2009
+++ src/sys/fs/sysvbfs/sysvbfs_vnops.c Tue Jan 5 13:30:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sysvbfs_vnops.c,v 1.24 2009/07/03 22:38:08 pgoyette Exp $ */
+/* $NetBSD: sysvbfs_vnops.c,v 1.25 2010/01/05 13:30:11 mbalmer Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.24 2009/07/03 22:38:08 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysvbfs_vnops.c,v 1.25 2010/01/05 13:30:11 mbalmer Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -732,25 +732,25 @@
switch (ap->a_name) {
case _PC_LINK_MAX:
*ap->a_retval = 1;
- break;;
+ break;
case _PC_NAME_MAX:
*ap->a_retval = BFS_FILENAME_MAXLEN;
- break;;
+ break;
case _PC_PATH_MAX:
*ap->a_retval = BFS_FILENAME_MAXLEN;
- break;;
+ break;
case _PC_CHOWN_RESTRICTED:
*ap->a_retval = 1;
- break;;
+ break;
case _PC_NO_TRUNC:
*ap->a_retval = 0;
- break;;
+ break;
case _PC_SYNC_IO:
*ap->a_retval = 1;
- break;;
+ break;
case _PC_FILESIZEBITS:
*ap->a_retval = 32;
- break;;
+ break;
default:
err = EINVAL;
break;
Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.100 src/sys/fs/udf/udf_subr.c:1.101
--- src/sys/fs/udf/udf_subr.c:1.100 Wed Dec 23 09:17:41 2009
+++ src/sys/fs/udf/udf_subr.c Tue Jan 5 13:30:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.100 2009/12/23 09:17:41 mbalmer Exp $ */
+/* $NetBSD: udf_subr.c,v 1.101 2010/01/05 13:30:11 mbalmer Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.100 2009/12/23 09:17:41 mbalmer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.101 2010/01/05 13:30:11 mbalmer Exp $");
#endif /* not lint */
@@ -4266,7 +4266,7 @@
uint32_t
udf_getaccessmode(struct udf_node *udf_node)
{
- struct file_entry *fe = udf_node->fe;;
+ struct file_entry *fe = udf_node->fe;
struct extfile_entry *efe = udf_node->efe;
uint32_t udf_perm, icbftype;
uint32_t mode, ftype;
@@ -5721,7 +5721,7 @@
int (**vnodeops)(void *), struct vattr *vap, struct componentname *cnp)
{
union dscrptr *dscr;
- struct udf_node *dir_node = VTOI(dvp);;
+ struct udf_node *dir_node = VTOI(dvp);
struct udf_node *udf_node;
struct udf_mount *ump = dir_node->ump;
struct vnode *nvp;
Index: src/sys/fs/udf/udf_vnops.c
diff -u src/sys/fs/udf/udf_vnops.c:1.55 src/sys/fs/udf/udf_vnops.c:1.56
--- src/sys/fs/udf/udf_vnops.c:1.55 Mon Sep 14 21:10:44 2009
+++ src/sys/fs/udf/udf_vnops.c Tue Jan 5 13:30:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_vnops.c,v 1.55 2009/09/14 21:10:44 reinoud Exp $ */
+/* $NetBSD: udf_vnops.c,v 1.56 2010/01/05 13:30:11 mbalmer Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.55 2009/09/14 21:10:44 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.56 2010/01/05 13:30:11 mbalmer Exp $");
#endif /* not lint */
@@ -2118,7 +2118,7 @@
struct vnode *dvp = ap->a_dvp;
struct vnode *vp = ap->a_vp;
struct componentname *cnp = ap->a_cnp;
- struct udf_node *dir_node = VTOI(dvp);;
+ struct udf_node *dir_node = VTOI(dvp);
struct udf_node *udf_node = VTOI(vp);
struct udf_mount *ump = dir_node->ump;
int error;
@@ -2159,7 +2159,7 @@
struct vnode *vp = ap->a_vp;
struct vnode *dvp = ap->a_dvp;
struct componentname *cnp = ap->a_cnp;
- struct udf_node *dir_node = VTOI(dvp);;
+ struct udf_node *dir_node = VTOI(dvp);
struct udf_node *udf_node = VTOI(vp);
struct udf_mount *ump = dir_node->ump;
int refcnt, error;
