Module Name: src
Committed By: maxv
Date: Thu Aug 21 06:40:35 UTC 2014
Modified Files:
src/sys/arch/arm/s3c2xx0: s3c24x0_lcd.c
src/sys/compat/netbsd32: netbsd32_compat_50.c netbsd32_compat_60.c
src/sys/compat/osf1: osf1_mount.c
src/sys/fs/ptyfs: ptyfs_vnops.c
Log Message:
Remove dead returns:
return VAR/func(XX);
return VAR;
The latter is never reached. Sent on tech-kern@, no disagreement.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c
cvs rdiff -u -r1.24 -r1.25 src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.1 -r1.2 src/sys/compat/netbsd32/netbsd32_compat_60.c
cvs rdiff -u -r1.50 -r1.51 src/sys/compat/osf1/osf1_mount.c
cvs rdiff -u -r1.49 -r1.50 src/sys/fs/ptyfs/ptyfs_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/arch/arm/s3c2xx0/s3c24x0_lcd.c
diff -u src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c:1.11 src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c:1.12
--- src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c:1.11 Mon Mar 10 04:25:51 2014
+++ src/sys/arch/arm/s3c2xx0/s3c24x0_lcd.c Thu Aug 21 06:40:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: s3c24x0_lcd.c,v 1.11 2014/03/10 04:25:51 htodd Exp $ */
+/* $NetBSD: s3c24x0_lcd.c,v 1.12 2014/08/21 06:40:35 maxv Exp $ */
/*
* Copyright (c) 2004 Genetec Corporation. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: s3c24x0_lcd.c,v 1.11 2014/03/10 04:25:51 htodd Exp $");
+__KERNEL_RCSID(0, "$NetBSD: s3c24x0_lcd.c,v 1.12 2014/08/21 06:40:35 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -735,7 +735,6 @@ s3c24x0_lcd_mmap(void *v, void *vs, off_
offset, prot, BUS_DMA_WAITOK|BUS_DMA_COHERENT);
/* printf("s3c24x0_lcd_mmap: ret: %lx\n", ret);*/
return ret;
- return -1;
}
Index: src/sys/compat/netbsd32/netbsd32_compat_50.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.24 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.25
--- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.24 Tue Jun 24 14:33:57 2014
+++ src/sys/compat/netbsd32/netbsd32_compat_50.c Thu Aug 21 06:40:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50.c,v 1.24 2014/06/24 14:33:57 maxv Exp $ */
+/* $NetBSD: netbsd32_compat_50.c,v 1.25 2014/08/21 06:40:35 maxv Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.24 2014/06/24 14:33:57 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.25 2014/08/21 06:40:35 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -139,7 +139,6 @@ compat_50_netbsd32_select(struct lwp *l,
return selcommon(retval, SCARG(uap, nd), SCARG_P32(uap, in),
SCARG_P32(uap, ou), SCARG_P32(uap, ex), ts, NULL);
- return 0;
}
int
@@ -563,7 +562,6 @@ compat_50_netbsd32__lwp_park(struct lwp
return lwp_park(CLOCK_REALTIME, TIMER_ABSTIME, tsp,
SCARG_P32(uap, hint));
- return 0;
}
static int
@@ -681,7 +679,6 @@ compat_50_netbsd32_pselect(struct lwp *l
return selcommon(retval, SCARG(uap, nd), SCARG_P32(uap, in),
SCARG_P32(uap, ou), SCARG_P32(uap, ex), ts, mask);
- return 0;
}
int
Index: src/sys/compat/netbsd32/netbsd32_compat_60.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_60.c:1.1 src/sys/compat/netbsd32/netbsd32_compat_60.c:1.2
--- src/sys/compat/netbsd32/netbsd32_compat_60.c:1.1 Fri Mar 29 01:13:54 2013
+++ src/sys/compat/netbsd32/netbsd32_compat_60.c Thu Aug 21 06:40:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_60.c,v 1.1 2013/03/29 01:13:54 christos Exp $ */
+/* $NetBSD: netbsd32_compat_60.c,v 1.2 2014/08/21 06:40:35 maxv Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.1 2013/03/29 01:13:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_60.c,v 1.2 2014/08/21 06:40:35 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,5 +83,4 @@ compat_60_netbsd32__lwp_park(struct lwp
return lwp_park(CLOCK_REALTIME, TIMER_ABSTIME, tsp,
SCARG_P32(uap, hint));
- return 0;
}
Index: src/sys/compat/osf1/osf1_mount.c
diff -u src/sys/compat/osf1/osf1_mount.c:1.50 src/sys/compat/osf1/osf1_mount.c:1.51
--- src/sys/compat/osf1/osf1_mount.c:1.50 Wed Nov 27 17:24:44 2013
+++ src/sys/compat/osf1/osf1_mount.c Thu Aug 21 06:40:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_mount.c,v 1.50 2013/11/27 17:24:44 christos Exp $ */
+/* $NetBSD: osf1_mount.c,v 1.51 2014/08/21 06:40:35 maxv Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osf1_mount.c,v 1.50 2013/11/27 17:24:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osf1_mount.c,v 1.51 2014/08/21 06:40:35 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -314,6 +314,4 @@ osf1_mount_nfs(struct lwp *l, const stru
return do_sys_mount(l, vfs_getopsbyname("nfs"), NULL, SCARG(uap, path),
SCARG(uap, flags), &bsd_na, UIO_SYSSPACE, sizeof bsd_na, &dummy);
-
- return 0;
}
Index: src/sys/fs/ptyfs/ptyfs_vnops.c
diff -u src/sys/fs/ptyfs/ptyfs_vnops.c:1.49 src/sys/fs/ptyfs/ptyfs_vnops.c:1.50
--- src/sys/fs/ptyfs/ptyfs_vnops.c:1.49 Fri Aug 15 13:40:39 2014
+++ src/sys/fs/ptyfs/ptyfs_vnops.c Thu Aug 21 06:40:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ptyfs_vnops.c,v 1.49 2014/08/15 13:40:39 hannken Exp $ */
+/* $NetBSD: ptyfs_vnops.c,v 1.50 2014/08/21 06:40:35 maxv Exp $ */
/*
* Copyright (c) 1993, 1995
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ptyfs_vnops.c,v 1.49 2014/08/15 13:40:39 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ptyfs_vnops.c,v 1.50 2014/08/21 06:40:35 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -579,8 +579,6 @@ ptyfs_access(void *v)
KAUTH_ACCESS_ACTION(ap->a_mode, ap->a_vp->v_type, va.va_mode),
ap->a_vp, NULL, genfs_can_access(va.va_type, va.va_mode, va.va_uid,
va.va_gid, ap->a_mode, ap->a_cred));
-
- return error;
}
/*
