summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorRyan Thomas McBride <mcbride@cvs.openbsd.org>2004-12-09 16:57:36 +0000
committerRyan Thomas McBride <mcbride@cvs.openbsd.org>2004-12-09 16:57:36 +0000
commitf551e7150bb8b4dc82b29a49f2e06a6faeeb8f31 (patch)
tree578dbbb4a2e163a450a918da2ebe56b625f5965e /sys
parent7a44b0bba18cef5f6cdcfe69f378bb819ee6a162 (diff)
Remove shadow variable 'error'. From camield@
Diffstat (limited to 'sys')
-rw-r--r--sys/net/if_ethersubr.c3
-rw-r--r--sys/net/if_fddisubr.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 2dbce582d7c..e9a4f20a5f9 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ethersubr.c,v 1.83 2004/12/07 20:38:46 mcbride Exp $ */
+/* $OpenBSD: if_ethersubr.c,v 1.84 2004/12/09 16:57:35 mcbride Exp $ */
/* $NetBSD: if_ethersubr.c,v 1.19 1996/05/07 02:40:30 thorpej Exp $ */
/*
@@ -536,7 +536,6 @@ ether_output(ifp0, m0, dst, rt0)
#if NCARP > 0
if (ifp->if_carp) {
- int error;
error = carp_output(ifp0, m, dst, NULL);
if (error)
goto bad;
diff --git a/sys/net/if_fddisubr.c b/sys/net/if_fddisubr.c
index 0ecfe2d0ac3..f579f97484f 100644
--- a/sys/net/if_fddisubr.c
+++ b/sys/net/if_fddisubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_fddisubr.c,v 1.40 2004/07/16 15:01:08 henning Exp $ */
+/* $OpenBSD: if_fddisubr.c,v 1.41 2004/12/09 16:57:35 mcbride Exp $ */
/* $NetBSD: if_fddisubr.c,v 1.5 1996/05/07 23:20:21 christos Exp $ */
/*
@@ -396,7 +396,6 @@ fddi_output(ifp, m0, dst, rt0)
sizeof(fh->fddi_shost));
#if NCARP > 0
if (ifp->if_carp) {
- int error;
error = carp_output(ifp, m, NULL, NULL);
if (error)
goto bad;