Module Name: src
Committed By: maxv
Date: Fri Jul 24 13:02:52 UTC 2015
Modified Files:
src/sys/compat/common: kern_time_50.c vfs_syscalls_20.c
src/sys/compat/linux/common: linux_socket.c
src/sys/compat/linux32/common: linux32_socket.c
src/sys/compat/netbsd32: netbsd32_compat_50.c
src/sys/compat/ultrix: ultrix_fs.c
src/sys/kern: kern_ntptime.c kern_time.c kern_veriexec.c sys_lwp.c
vfs_syscalls.c
src/sys/miscfs/procfs: procfs_linux.c
src/sys/ufs/ffs: ffs_vfsops.c
Log Message:
Unused inits (harmless).
Found by Brainy.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/compat/common/kern_time_50.c
cvs rdiff -u -r1.38 -r1.39 src/sys/compat/common/vfs_syscalls_20.c
cvs rdiff -u -r1.125 -r1.126 src/sys/compat/linux/common/linux_socket.c
cvs rdiff -u -r1.19 -r1.20 src/sys/compat/linux32/common/linux32_socket.c
cvs rdiff -u -r1.29 -r1.30 src/sys/compat/netbsd32/netbsd32_compat_50.c
cvs rdiff -u -r1.54 -r1.55 src/sys/compat/ultrix/ultrix_fs.c
cvs rdiff -u -r1.55 -r1.56 src/sys/kern/kern_ntptime.c
cvs rdiff -u -r1.179 -r1.180 src/sys/kern/kern_time.c
cvs rdiff -u -r1.8 -r1.9 src/sys/kern/kern_veriexec.c
cvs rdiff -u -r1.56 -r1.57 src/sys/kern/sys_lwp.c
cvs rdiff -u -r1.499 -r1.500 src/sys/kern/vfs_syscalls.c
cvs rdiff -u -r1.70 -r1.71 src/sys/miscfs/procfs/procfs_linux.c
cvs rdiff -u -r1.334 -r1.335 src/sys/ufs/ffs/ffs_vfsops.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/compat/common/kern_time_50.c
diff -u src/sys/compat/common/kern_time_50.c:1.28 src/sys/compat/common/kern_time_50.c:1.29
--- src/sys/compat/common/kern_time_50.c:1.28 Sun Nov 9 17:48:07 2014
+++ src/sys/compat/common/kern_time_50.c Fri Jul 24 13:02:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time_50.c,v 1.28 2014/11/09 17:48:07 maxv Exp $ */
+/* $NetBSD: kern_time_50.c,v 1.29 2015/07/24 13:02:52 maxv Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_time_50.c,v 1.28 2014/11/09 17:48:07 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time_50.c,v 1.29 2015/07/24 13:02:52 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_aio.h"
@@ -123,7 +123,7 @@ compat_50_sys_clock_getres(struct lwp *l
} */
struct timespec50 ats50;
struct timespec ats;
- int error = 0;
+ int error;
error = clock_getres1(SCARG(uap, clock_id), &ats);
if (error != 0)
Index: src/sys/compat/common/vfs_syscalls_20.c
diff -u src/sys/compat/common/vfs_syscalls_20.c:1.38 src/sys/compat/common/vfs_syscalls_20.c:1.39
--- src/sys/compat/common/vfs_syscalls_20.c:1.38 Fri Sep 5 09:21:54 2014
+++ src/sys/compat/common/vfs_syscalls_20.c Fri Jul 24 13:02:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls_20.c,v 1.38 2014/09/05 09:21:54 matt Exp $ */
+/* $NetBSD: vfs_syscalls_20.c,v 1.39 2015/07/24 13:02:52 maxv Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_20.c,v 1.38 2014/09/05 09:21:54 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_20.c,v 1.39 2015/07/24 13:02:52 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -90,7 +90,7 @@ static int
vfs2fs(struct statfs12 *bfs, const struct statvfs *fs)
{
struct statfs12 ofs;
- int i = 0;
+ int i;
ofs.f_type = 0;
ofs.f_oflags = (short)fs->f_flag;
@@ -139,7 +139,7 @@ compat_20_sys_statfs(struct lwp *l, cons
} */
struct mount *mp;
struct statvfs *sbuf;
- int error = 0;
+ int error;
struct vnode *vp;
error = namei_simple_user(SCARG(uap, path),
Index: src/sys/compat/linux/common/linux_socket.c
diff -u src/sys/compat/linux/common/linux_socket.c:1.125 src/sys/compat/linux/common/linux_socket.c:1.126
--- src/sys/compat/linux/common/linux_socket.c:1.125 Sun May 24 17:07:26 2015
+++ src/sys/compat/linux/common/linux_socket.c Fri Jul 24 13:02:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_socket.c,v 1.125 2015/05/24 17:07:26 rtr Exp $ */
+/* $NetBSD: linux_socket.c,v 1.126 2015/07/24 13:02:52 maxv Exp $ */
/*-
* Copyright (c) 1995, 1998, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.125 2015/05/24 17:07:26 rtr Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.126 2015/07/24 13:02:52 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -1115,7 +1115,7 @@ linux_getifconf(struct lwp *l, register_
struct ifaddr *ifa;
struct sockaddr *sa;
struct osockaddr *osa;
- int space = 0, error = 0;
+ int space = 0, error;
const int sz = (int)sizeof(ifr);
bool docopy;
Index: src/sys/compat/linux32/common/linux32_socket.c
diff -u src/sys/compat/linux32/common/linux32_socket.c:1.19 src/sys/compat/linux32/common/linux32_socket.c:1.20
--- src/sys/compat/linux32/common/linux32_socket.c:1.19 Wed Nov 26 09:53:53 2014
+++ src/sys/compat/linux32/common/linux32_socket.c Fri Jul 24 13:02:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_socket.c,v 1.19 2014/11/26 09:53:53 ozaki-r Exp $ */
+/* $NetBSD: linux32_socket.c,v 1.20 2015/07/24 13:02:52 maxv Exp $ */
/*-
* Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_socket.c,v 1.19 2014/11/26 09:53:53 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_socket.c,v 1.20 2015/07/24 13:02:52 maxv Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -416,7 +416,7 @@ linux32_getifconf(struct lwp *l, registe
struct ifaddr *ifa;
struct sockaddr *sa;
struct osockaddr *osa;
- int space = 0, error = 0;
+ int space = 0, error;
const int sz = (int)sizeof(ifr);
bool docopy;
Index: src/sys/compat/netbsd32/netbsd32_compat_50.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.29 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.30
--- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.29 Sun Jun 21 08:47:15 2015
+++ src/sys/compat/netbsd32/netbsd32_compat_50.c Fri Jul 24 13:02:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_50.c,v 1.29 2015/06/21 08:47:15 martin Exp $ */
+/* $NetBSD: netbsd32_compat_50.c,v 1.30 2015/07/24 13:02:52 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.29 2015/06/21 08:47:15 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.30 2015/07/24 13:02:52 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -352,7 +352,7 @@ compat_50_netbsd32_clock_getres(struct l
} */
struct netbsd32_timespec50 ts32;
struct timespec ts;
- int error = 0;
+ int error;
error = clock_getres1(SCARG(uap, clock_id), &ts);
if (error != 0)
Index: src/sys/compat/ultrix/ultrix_fs.c
diff -u src/sys/compat/ultrix/ultrix_fs.c:1.54 src/sys/compat/ultrix/ultrix_fs.c:1.55
--- src/sys/compat/ultrix/ultrix_fs.c:1.54 Wed Nov 27 17:24:44 2013
+++ src/sys/compat/ultrix/ultrix_fs.c Fri Jul 24 13:02:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_fs.c,v 1.54 2013/11/27 17:24:44 christos Exp $ */
+/* $NetBSD: ultrix_fs.c,v 1.55 2015/07/24 13:02:52 maxv Exp $ */
/*
* Copyright (c) 1995, 1997 Jonathan Stone
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.54 2013/11/27 17:24:44 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_fs.c,v 1.55 2015/07/24 13:02:52 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -214,7 +214,7 @@ ultrix_sys_getmnt(struct lwp *l, const s
int skip;
int start;
long count, maxcount;
- int error = 0;
+ int error;
nmp = NULL; /* XXX keep gcc quiet */
path = NULL;
Index: src/sys/kern/kern_ntptime.c
diff -u src/sys/kern/kern_ntptime.c:1.55 src/sys/kern/kern_ntptime.c:1.56
--- src/sys/kern/kern_ntptime.c:1.55 Tue Feb 25 18:30:11 2014
+++ src/sys/kern/kern_ntptime.c Fri Jul 24 13:02:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ntptime.c,v 1.55 2014/02/25 18:30:11 pooka Exp $ */
+/* $NetBSD: kern_ntptime.c,v 1.56 2015/07/24 13:02:52 maxv Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/sys/kern/kern_ntptime.c,v 1.59 2005/05/28 14:34:41 rwatson Exp $"); */
-__KERNEL_RCSID(0, "$NetBSD: kern_ntptime.c,v 1.55 2014/02/25 18:30:11 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ntptime.c,v 1.56 2015/07/24 13:02:52 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_ntp.h"
@@ -260,7 +260,7 @@ sys_ntp_adjtime(struct lwp *l, const str
syscallarg(struct timex *) tp;
} */
struct timex ntv;
- int error = 0;
+ int error;
error = copyin((void *)SCARG(uap, tp), (void *)&ntv, sizeof(ntv));
if (error != 0)
Index: src/sys/kern/kern_time.c
diff -u src/sys/kern/kern_time.c:1.179 src/sys/kern/kern_time.c:1.180
--- src/sys/kern/kern_time.c:1.179 Wed May 22 16:00:52 2013
+++ src/sys/kern/kern_time.c Fri Jul 24 13:02:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time.c,v 1.179 2013/05/22 16:00:52 christos Exp $ */
+/* $NetBSD: kern_time.c,v 1.180 2015/07/24 13:02:52 maxv Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.179 2013/05/22 16:00:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.180 2015/07/24 13:02:52 maxv Exp $");
#include <sys/param.h>
#include <sys/resourcevar.h>
@@ -238,7 +238,7 @@ sys___clock_getres50(struct lwp *l, cons
syscallarg(struct timespec *) tp;
} */
struct timespec ts;
- int error = 0;
+ int error;
if ((error = clock_getres1(SCARG(uap, clock_id), &ts)) != 0)
return error;
@@ -454,7 +454,7 @@ sys___adjtime50(struct lwp *l, const str
syscallarg(const struct timeval *) delta;
syscallarg(struct timeval *) olddelta;
} */
- int error = 0;
+ int error;
struct timeval atv, oldatv;
if ((error = kauth_authorize_system(l->l_cred, KAUTH_SYSTEM_TIME,
Index: src/sys/kern/kern_veriexec.c
diff -u src/sys/kern/kern_veriexec.c:1.8 src/sys/kern/kern_veriexec.c:1.9
--- src/sys/kern/kern_veriexec.c:1.8 Mon Apr 27 20:21:19 2015
+++ src/sys/kern/kern_veriexec.c Fri Jul 24 13:02:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_veriexec.c,v 1.8 2015/04/27 20:21:19 riastradh Exp $ */
+/* $NetBSD: kern_veriexec.c,v 1.9 2015/07/24 13:02:52 maxv Exp $ */
/*-
* Copyright (c) 2005, 2006 Elad Efrat <e...@netbsd.org>
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.8 2015/04/27 20:21:19 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.9 2015/07/24 13:02:52 maxv Exp $");
#include "opt_veriexec.h"
@@ -555,7 +555,7 @@ veriexec_fp_status(struct lwp *l, struct
{
size_t hash_len = vfe->ops->hash_len;
u_char *digest;
- int error = 0;
+ int error;
digest = kmem_zalloc(hash_len, KM_SLEEP);
Index: src/sys/kern/sys_lwp.c
diff -u src/sys/kern/sys_lwp.c:1.56 src/sys/kern/sys_lwp.c:1.57
--- src/sys/kern/sys_lwp.c:1.56 Fri Mar 29 01:08:17 2013
+++ src/sys/kern/sys_lwp.c Fri Jul 24 13:02:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_lwp.c,v 1.56 2013/03/29 01:08:17 christos Exp $ */
+/* $NetBSD: sys_lwp.c,v 1.57 2015/07/24 13:02:52 maxv Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sys_lwp.c,v 1.56 2013/03/29 01:08:17 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_lwp.c,v 1.57 2015/07/24 13:02:52 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -134,7 +134,7 @@ sys__lwp_create(struct lwp *l, const str
syscallarg(lwpid_t *) new_lwp;
} */
struct proc *p = l->l_proc;
- ucontext_t *newuc = NULL;
+ ucontext_t *newuc;
lwpid_t lid;
int error;
Index: src/sys/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.499 src/sys/kern/vfs_syscalls.c:1.500
--- src/sys/kern/vfs_syscalls.c:1.499 Fri Jun 12 19:06:32 2015
+++ src/sys/kern/vfs_syscalls.c Fri Jul 24 13:02:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.499 2015/06/12 19:06:32 dholland Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.500 2015/07/24 13:02:52 maxv Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.499 2015/06/12 19:06:32 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls.c,v 1.500 2015/07/24 13:02:52 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_fileassoc.h"
@@ -1950,7 +1950,7 @@ dofhopen(struct lwp *l, const void *ufhp
struct vnode *vp = NULL;
kauth_cred_t cred = l->l_cred;
file_t *nfp;
- int indx, error = 0;
+ int indx, error;
struct vattr va;
fhandle_t *fh;
int flags;
Index: src/sys/miscfs/procfs/procfs_linux.c
diff -u src/sys/miscfs/procfs/procfs_linux.c:1.70 src/sys/miscfs/procfs/procfs_linux.c:1.71
--- src/sys/miscfs/procfs/procfs_linux.c:1.70 Sun Aug 10 06:22:06 2014
+++ src/sys/miscfs/procfs/procfs_linux.c Fri Jul 24 13:02:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_linux.c,v 1.70 2014/08/10 06:22:06 matt Exp $ */
+/* $NetBSD: procfs_linux.c,v 1.71 2015/07/24 13:02:52 maxv Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.70 2014/08/10 06:22:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_linux.c,v 1.71 2015/07/24 13:02:52 maxv Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -371,7 +371,6 @@ procfs_do_pid_statm(struct lwp *curl, st
int error;
int len;
- error = ENAMETOOLONG;
bf = malloc(LBFSZ, M_TEMP, M_WAITOK);
/* XXX - we use values from vmspace, since dsl says that ru figures
@@ -419,7 +418,7 @@ procfs_do_pid_stat(struct lwp *curl, str
struct timeval rt;
struct vmspace *vm;
struct kinfo_proc2 ki;
- int error = 0;
+ int error;
bf = malloc(LBFSZ, M_TEMP, M_WAITOK);
Index: src/sys/ufs/ffs/ffs_vfsops.c
diff -u src/sys/ufs/ffs/ffs_vfsops.c:1.334 src/sys/ufs/ffs/ffs_vfsops.c:1.335
--- src/sys/ufs/ffs/ffs_vfsops.c:1.334 Sat May 23 16:59:13 2015
+++ src/sys/ufs/ffs/ffs_vfsops.c Fri Jul 24 13:02:52 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_vfsops.c,v 1.334 2015/05/23 16:59:13 maxv Exp $ */
+/* $NetBSD: ffs_vfsops.c,v 1.335 2015/07/24 13:02:52 maxv Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.334 2015/05/23 16:59:13 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_vfsops.c,v 1.335 2015/07/24 13:02:52 maxv Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ffs.h"
@@ -2269,7 +2269,7 @@ ffs_sbupdate(struct ufsmount *mp, int wa
{
struct fs *fs = mp->um_fs;
struct buf *bp;
- int error = 0;
+ int error;
u_int32_t saveflag;
error = ffs_getblk(mp->um_devvp,
