From 2e35ca6c33cd9c089b6536e9405e2f90a8ec101c Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Tue, 7 Oct 2008 12:31:31 -0700 Subject: update code to follow new semicolon rules: * 1. all statements and declarations are terminated by semicolons * 2. semicolons can be omitted at top level. * 3. semicolons can be omitted before and after the closing ) or } * on a list of statements or declarations. /home/rsc/bin/addsemi and then diff+tweak. R=r,gri OCL=16620 CL=16643 --- src/lib/net/net_darwin.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/lib/net/net_darwin.go') diff --git a/src/lib/net/net_darwin.go b/src/lib/net/net_darwin.go index 3accbe13b..8ce94da6c 100644 --- a/src/lib/net/net_darwin.go +++ b/src/lib/net/net_darwin.go @@ -11,7 +11,7 @@ import ( ) export func IPv4ToSockaddr(p *[]byte, port int) (sa1 *syscall.Sockaddr, err *os.Error) { - p = ToIPv4(p) + p = ToIPv4(p); if p == nil || port < 0 || port > 0xFFFF { return nil, os.EINVAL } @@ -27,7 +27,7 @@ export func IPv4ToSockaddr(p *[]byte, port int) (sa1 *syscall.Sockaddr, err *os. } export func IPv6ToSockaddr(p *[]byte, port int) (sa1 *syscall.Sockaddr, err *os.Error) { - p = ToIPv6(p) + p = ToIPv6(p); if p == nil || port < 0 || port > 0xFFFF { return nil, os.EINVAL } @@ -46,18 +46,18 @@ export func SockaddrToIP(sa1 *syscall.Sockaddr) (p *[]byte, port int, err *os.Er switch sa1.family { case syscall.AF_INET: sa := syscall.SockaddrToSockaddrInet4(sa1); - a := ToIPv6(&sa.addr) + a := ToIPv6(&sa.addr); if a == nil { return nil, 0, os.EINVAL } - return a, int(sa.port[0])<<8 + int(sa.port[1]), nil + return a, int(sa.port[0])<<8 + int(sa.port[1]), nil; case syscall.AF_INET6: sa := syscall.SockaddrToSockaddrInet6(sa1); - a := ToIPv6(&sa.addr) + a := ToIPv6(&sa.addr); if a == nil { return nil, 0, os.EINVAL } - return a, int(sa.port[0])<<8 + int(sa.port[1]), nil + return a, int(sa.port[0])<<8 + int(sa.port[1]), nil; default: return nil, 0, os.EINVAL } -- cgit v1.2.3