aboutsummaryrefslogtreecommitdiff
path: root/src/pkg/net/interface_linux.go
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2011-11-01 22:05:34 -0400
committerRuss Cox <rsc@golang.org>2011-11-01 22:05:34 -0400
commiteb6929299b6da3d9bea1fa7f7cd319c2de9242bb (patch)
treed3309a8985202985334709bc50e1a737ea117593 /src/pkg/net/interface_linux.go
parentc2049d2dfeeea3d41fafa91e3e3f0e47c285355b (diff)
downloadgo-eb6929299b6da3d9bea1fa7f7cd319c2de9242bb.tar.xz
src/pkg/[n-z]*: gofix -r error -force=error
R=golang-dev, bsiegert, iant CC=golang-dev https://golang.org/cl/5294074
Diffstat (limited to 'src/pkg/net/interface_linux.go')
-rw-r--r--src/pkg/net/interface_linux.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pkg/net/interface_linux.go b/src/pkg/net/interface_linux.go
index 36ae04ffa7..cd0339d61b 100644
--- a/src/pkg/net/interface_linux.go
+++ b/src/pkg/net/interface_linux.go
@@ -16,7 +16,7 @@ import (
// If the ifindex is zero, interfaceTable returns mappings of all
// network interfaces. Otheriwse it returns a mapping of a specific
// interface.
-func interfaceTable(ifindex int) ([]Interface, os.Error) {
+func interfaceTable(ifindex int) ([]Interface, error) {
var (
ift []Interface
tab []byte
@@ -101,11 +101,11 @@ func linkFlags(rawFlags uint32) Flags {
// If the ifindex is zero, interfaceAddrTable returns addresses
// for all network interfaces. Otherwise it returns addresses
// for a specific interface.
-func interfaceAddrTable(ifindex int) ([]Addr, os.Error) {
+func interfaceAddrTable(ifindex int) ([]Addr, error) {
var (
tab []byte
e int
- err os.Error
+ err error
ifat []Addr
msgs []syscall.NetlinkMessage
)
@@ -128,7 +128,7 @@ func interfaceAddrTable(ifindex int) ([]Addr, os.Error) {
return ifat, nil
}
-func addrTable(msgs []syscall.NetlinkMessage, ifindex int) ([]Addr, os.Error) {
+func addrTable(msgs []syscall.NetlinkMessage, ifindex int) ([]Addr, error) {
var ifat []Addr
for _, m := range msgs {
@@ -175,10 +175,10 @@ func newAddr(attrs []syscall.NetlinkRouteAttr, family int) []Addr {
// If the ifindex is zero, interfaceMulticastAddrTable returns
// addresses for all network interfaces. Otherwise it returns
// addresses for a specific interface.
-func interfaceMulticastAddrTable(ifindex int) ([]Addr, os.Error) {
+func interfaceMulticastAddrTable(ifindex int) ([]Addr, error) {
var (
ifi *Interface
- err os.Error
+ err error
)
if ifindex > 0 {