Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch declare error
details: https://anonhg.NetBSD.org/src/rev/486e9d01eda2
branches: trunk
changeset: 335282:486e9d01eda2
user: christos <christos%NetBSD.org@localhost>
date: Thu Jan 01 17:46:09 2015 +0000
description:
declare error
diffstat:
sys/arch/atari/dev/fd.c | 5 +++--
sys/arch/mac68k/obio/iwm_fd.c | 5 +++--
sys/arch/x68k/dev/fd.c | 6 +++---
3 files changed, 9 insertions(+), 7 deletions(-)
diffs (79 lines):
diff -r 3466619c8702 -r 486e9d01eda2 sys/arch/atari/dev/fd.c
--- a/sys/arch/atari/dev/fd.c Thu Jan 01 17:34:00 2015 +0000
+++ b/sys/arch/atari/dev/fd.c Thu Jan 01 17:46:09 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.81 2014/12/31 19:52:04 christos Exp $ */
+/* $NetBSD: fd.c,v 1.82 2015/01/01 17:46:09 christos Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.81 2014/12/31 19:52:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.82 2015/01/01 17:46:09 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -426,6 +426,7 @@
fdioctl(dev_t dev, u_long cmd, void * addr, int flag, struct lwp *l)
{
struct fd_softc *sc;
+ int error;
sc = device_lookup_private(&fd_cd, DISKUNIT(dev));
diff -r 3466619c8702 -r 486e9d01eda2 sys/arch/mac68k/obio/iwm_fd.c
--- a/sys/arch/mac68k/obio/iwm_fd.c Thu Jan 01 17:34:00 2015 +0000
+++ b/sys/arch/mac68k/obio/iwm_fd.c Thu Jan 01 17:46:09 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: iwm_fd.c,v 1.51 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: iwm_fd.c,v 1.52 2015/01/01 17:47:21 christos Exp $ */
/*
* Copyright (c) 1997, 1998 Hauke Fath. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.51 2014/12/31 19:52:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.52 2015/01/01 17:47:21 christos Exp $");
#include "locators.h"
@@ -703,6 +703,7 @@
int result, fdUnit, fdType;
fd_softc_t *fd;
iwm_softc_t *iwm = device_lookup_private(&iwm_cd, 0);
+ int error;
if (TRACE_IOCTL)
printf("iwm: Execute ioctl... ");
diff -r 3466619c8702 -r 486e9d01eda2 sys/arch/x68k/dev/fd.c
--- a/sys/arch/x68k/dev/fd.c Thu Jan 01 17:34:00 2015 +0000
+++ b/sys/arch/x68k/dev/fd.c Thu Jan 01 17:46:09 2015 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.112 2014/12/31 19:52:05 christos Exp $ */
+/* $NetBSD: fd.c,v 1.113 2015/01/01 17:48:56 christos Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.112 2014/12/31 19:52:05 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.113 2015/01/01 17:48:56 christos Exp $");
#include "opt_ddb.h"
#include "opt_m68k_arch.h"
@@ -1612,7 +1612,7 @@
int error;
unsigned int scratch;
int il[FD_MAX_NSEC + 1];
- int i, j;
+ int i, j, error;
error = disk_ioctl(&fd->sc_dk, dev, cmd, addr, flag, l);
if (error != EPASSTHROUGH)
Home |
Main Index |
Thread Index |
Old Index