From 3696e3e558a5be76b8af9698ff0e56719e47ec59 Mon Sep 17 00:00:00 2001 From: Rob Pike Date: Fri, 17 Apr 2009 00:08:24 -0700 Subject: Step 1 of the Big Error Shift: make os.Error an interface and replace *os.Errors with os.Errors. lib/template updated to use new setup; its clients also updated. Step 2 will make os's error support internally much cleaner. R=rsc OCL=27586 CL=27586 --- src/lib/net/net_linux.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/net/net_linux.go') diff --git a/src/lib/net/net_linux.go b/src/lib/net/net_linux.go index ddc13d347..b6bfe7646 100644 --- a/src/lib/net/net_linux.go +++ b/src/lib/net/net_linux.go @@ -11,7 +11,7 @@ import ( "unsafe"; ) -func v4ToSockaddr(p IP, port int) (sa1 *syscall.Sockaddr, err *os.Error) { +func v4ToSockaddr(p IP, port int) (sa1 *syscall.Sockaddr, err os.Error) { p = p.To4(); if p == nil || port < 0 || port > 0xFFFF { return nil, os.EINVAL @@ -26,7 +26,7 @@ func v4ToSockaddr(p IP, port int) (sa1 *syscall.Sockaddr, err *os.Error) { return (*syscall.Sockaddr)(unsafe.Pointer(sa)), nil } -func v6ToSockaddr(p IP, port int) (sa1 *syscall.Sockaddr, err *os.Error) { +func v6ToSockaddr(p IP, port int) (sa1 *syscall.Sockaddr, err os.Error) { p = p.To16(); if p == nil || port < 0 || port > 0xFFFF { return nil, os.EINVAL @@ -49,7 +49,7 @@ func v6ToSockaddr(p IP, port int) (sa1 *syscall.Sockaddr, err *os.Error) { return (*syscall.Sockaddr)(unsafe.Pointer(sa)), nil } -func sockaddrToIP(sa1 *syscall.Sockaddr) (p IP, port int, err *os.Error) { +func sockaddrToIP(sa1 *syscall.Sockaddr) (p IP, port int, err os.Error) { switch sa1.Family { case syscall.AF_INET: sa := (*syscall.SockaddrInet4)(unsafe.Pointer(sa1)); -- cgit v1.2.3