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

7 files changed, 133 insertions, 133 deletions

diff --git a/src/lib/net/fd.go b/src/lib/net/fd.go
index a93dac007..977df37a4 100644
--- a/src/lib/net/fd.go
+++ b/src/lib/net/fd.go
@@ -28,11 +28,11 @@ export type FD struct {
 
 // Make reads and writes on fd return EAGAIN instead of blocking.
 func SetNonblock(fd int64) *os.Error {
-	flags, e := syscall.fcntl(fd, syscall.F_GETFL, 0)
+	flags, e := syscall.fcntl(fd, syscall.F_GETFL, 0);
 	if e != 0 {
 		return os.ErrnoToError(e)
 	}
-	flags, e = syscall.fcntl(fd, syscall.F_SETFL, flags | syscall.O_NONBLOCK)
+	flags, e = syscall.fcntl(fd, syscall.F_SETFL, flags | syscall.O_NONBLOCK);
 	if e != 0 {
 		return os.ErrnoToError(e)
 	}
@@ -87,7 +87,7 @@ func NewPollServer() (s *PollServer, err *os.Error) {
 	if err = SetNonblock(s.pr.fd); err != nil {
 	Error:
 		s.pr.Close();
-		s.pw.Close()
+		s.pw.Close();
 		return nil, err
 	}
 	if err = SetNonblock(s.pw.fd); err != nil {
@@ -97,40 +97,40 @@ func NewPollServer() (s *PollServer, err *os.Error) {
 		goto Error
 	}
 	if err = s.poll.AddFD(s.pr.fd, 'r', true); err != nil {
-		s.poll.Close()
+		s.poll.Close();
 		goto Error
 	}
-	s.pending = new(map[int64] *FD)
-	go s.Run()
+	s.pending = new(map[int64] *FD);
+	go s.Run();
 	return s, nil
 }
 
 func (s *PollServer) AddFD(fd *FD, mode int) {
 	if err := s.poll.AddFD(fd.fd, mode, false); err != nil {
-		print("PollServer AddFD: ", err.String(), "\n")
+		print("PollServer AddFD: ", err.String(), "\n");
 		return
 	}
 
-	key := fd.fd << 1
+	key := fd.fd << 1;
 	if mode == 'r' {
-		fd.ncr++
+		fd.ncr++;
 	} else {
-		fd.ncw++
-		key++
+		fd.ncw++;
+		key++;
 	}
 	s.pending[key] = fd
 }
 
 func (s *PollServer) LookupFD(fd int64, mode int) *FD {
-	key := fd << 1
+	key := fd << 1;
 	if mode == 'w' {
-		key++
+		key++;
 	}
-	netfd, ok := s.pending[key]
+	netfd, ok := s.pending[key];
 	if !ok {
 		return nil
 	}
-	s.pending[key] = nil, false
+	s.pending[key] = nil, false;
 	return netfd
 }
 
@@ -139,7 +139,7 @@ func (s *PollServer) Run() {
 	for {
 		fd, mode, err := s.poll.WaitFD();
 		if err != nil {
-			print("PollServer WaitFD: ", err.String(), "\n")
+			print("PollServer WaitFD: ", err.String(), "\n");
 			return
 		}
 		if fd == s.pr.fd {
@@ -156,19 +156,19 @@ func (s *PollServer) Run() {
 				s.AddFD(fd, 'w')
 			}
 		} else {
-			netfd := s.LookupFD(fd, mode)
+			netfd := s.LookupFD(fd, mode);
 			if netfd == nil {
-				print("PollServer: unexpected wakeup for fd=", netfd, " mode=", string(mode), "\n")
+				print("PollServer: unexpected wakeup for fd=", netfd, " mode=", string(mode), "\n");
 				continue
 			}
 			if mode == 'r' {
 				for netfd.ncr > 0 {
-					netfd.ncr--
+					netfd.ncr--;
 					netfd.cr <- netfd
 				}
 			} else {
 				for netfd.ncw > 0 {
-					netfd.ncw--
+					netfd.ncw--;
 					netfd.cw <- netfd
 				}
 			}
@@ -200,7 +200,7 @@ func (s *PollServer) WaitWrite(fd *FD) {
 var pollserver *PollServer
 
 func StartServer() {
-	p, err := NewPollServer()
+	p, err := NewPollServer();
 	if err != nil {
 		print("Start PollServer: ", err.String(), "\n")
 	}
@@ -228,7 +228,7 @@ func (fd *FD) Close() *os.Error {
 	}
 	e := fd.osfd.Close();
 	fd.osfd = nil;
-	fd.fd = -1
+	fd.fd = -1;
 	return e
 }
 
@@ -236,7 +236,7 @@ func (fd *FD) Read(p *[]byte) (n int, err *os.Error) {
 	if fd == nil || fd.osfd == nil {
 		return -1, os.EINVAL
 	}
-	n, err = fd.osfd.Read(p)
+	n, err = fd.osfd.Read(p);
 	for err == os.EAGAIN {
 		pollserver.WaitRead(fd);
 		n, err = fd.osfd.Read(p)
@@ -249,7 +249,7 @@ func (fd *FD) Write(p *[]byte) (n int, err *os.Error) {
 		return -1, os.EINVAL
 	}
 	err = nil;
-	nn := 0
+	nn := 0;
 	for nn < len(p) && err == nil {
 		n, err = fd.osfd.Write(p[nn:len(p)]);
 		for err == os.EAGAIN {
@@ -270,7 +270,7 @@ func (fd *FD) Accept(sa *syscall.Sockaddr) (nfd *FD, err *os.Error) {
 	if fd == nil || fd.osfd == nil {
 		return nil, os.EINVAL
 	}
-	s, e := syscall.accept(fd.fd, sa)
+	s, e := syscall.accept(fd.fd, sa);
 	for e == syscall.EAGAIN {
 		pollserver.WaitRead(fd);
 		s, e = syscall.accept(fd.fd, sa)
@@ -279,7 +279,7 @@ func (fd *FD) Accept(sa *syscall.Sockaddr) (nfd *FD, err *os.Error) {
 		return nil, os.ErrnoToError(e)
 	}
 	if nfd, err = NewFD(s); err != nil {
-		syscall.close(s)
+		syscall.close(s);
 		return nil, err
 	}
 	return nfd, nil
diff --git a/src/lib/net/fd_darwin.go b/src/lib/net/fd_darwin.go
index 16f0d4e02..3f2816737 100644
--- a/src/lib/net/fd_darwin.go
+++ b/src/lib/net/fd_darwin.go
@@ -24,7 +24,7 @@ export func NewPollster() (p *Pollster, err *os.Error) {
 	if p.kq, e = syscall.kqueue(); e != 0 {
 		return nil, os.ErrnoToError(e)
 	}
-	p.events = (&p.eventbuf)[0:0]
+	p.events = (&p.eventbuf)[0:0];
 	return p, nil
 }
 
@@ -44,7 +44,7 @@ func (p *Pollster) AddFD(fd int64, mode int, repeat bool) *os.Error {
 	// EV_RECEIPT - generate fake EV_ERROR as result of add,
 	//	rather than waiting for real event
 	// EV_ONESHOT - delete the event the first time it triggers
-	ev.flags = syscall.EV_ADD | syscall.EV_RECEIPT
+	ev.flags = syscall.EV_ADD | syscall.EV_RECEIPT;
 	if !repeat {
 		ev.flags |= syscall.EV_ONESHOT
 	}
@@ -64,7 +64,7 @@ func (p *Pollster) AddFD(fd int64, mode int, repeat bool) *os.Error {
 
 func (p *Pollster) WaitFD() (fd int64, mode int, err *os.Error) {
 	for len(p.events) == 0 {
-		nn, e := syscall.kevent(p.kq, nil, &p.eventbuf, nil)
+		nn, e := syscall.kevent(p.kq, nil, &p.eventbuf, nil);
 		if e != 0 {
 			if e == syscall.EAGAIN || e == syscall.EINTR {
 				continue
@@ -85,6 +85,6 @@ func (p *Pollster) WaitFD() (fd int64, mode int, err *os.Error) {
 }
 
 func (p *Pollster) Close() *os.Error {
-	r, e := syscall.close(p.kq)
+	r, e := syscall.close(p.kq);
 	return os.ErrnoToError(e)
 }
diff --git a/src/lib/net/fd_linux.go b/src/lib/net/fd_linux.go
index e20ca9401..05b7250e5 100644
--- a/src/lib/net/fd_linux.go
+++ b/src/lib/net/fd_linux.go
@@ -34,7 +34,7 @@ export func NewPollster() (p *Pollster, err *os.Error) {
 	if p.epfd, e = syscall.epoll_create(16); e != 0 {
 		return nil, os.ErrnoToError(e)
 	}
-	p.events = new(map[int64] uint)
+	p.events = new(map[int64] uint);
 	return p, nil
 }
 
@@ -42,7 +42,7 @@ func (p *Pollster) AddFD(fd int64, mode int, repeat bool) *os.Error {
 	var ev syscall.EpollEvent
 	var already bool;
 	ev.fd = int32(fd);
-	ev.events, already = p.events[fd]
+	ev.events, already = p.events[fd];
 	if !repeat {
 		ev.events |= syscall.EPOLLONESHOT
 	}
@@ -52,7 +52,7 @@ func (p *Pollster) AddFD(fd int64, mode int, repeat bool) *os.Error {
 		ev.events |= Write
 	}
 
-	var op int64
+	var op int64;
 	if already {
 		op = syscall.EPOLL_CTL_MOD
 	} else {
@@ -61,14 +61,14 @@ func (p *Pollster) AddFD(fd int64, mode int, repeat bool) *os.Error {
 	if e := syscall.epoll_ctl(p.epfd, op, fd, &ev); e != 0 {
 		return os.ErrnoToError(e)
 	}
-	p.events[fd] = ev.events
+	p.events[fd] = ev.events;
 	return nil
 }
 
 func (p *Pollster) StopWaiting(fd int64, bits uint) {
-	events, already := p.events[fd]
+	events, already := p.events[fd];
 	if !already {
-		print("Epoll unexpected fd=", fd, "\n")
+		print("Epoll unexpected fd=", fd, "\n");
 		return
 	}
 
@@ -81,7 +81,7 @@ func (p *Pollster) StopWaiting(fd int64, bits uint) {
 	// Disable the given bits.
 	// If we're still waiting for other events, modify the fd
 	// event in the kernel.  Otherwise, delete it.
-	events &= ^bits
+	events &= ^bits;
 	if int32(events) & ^syscall.EPOLLONESHOT != 0 {
 		var ev syscall.EpollEvent;
 		ev.fd = int32(fd);
@@ -102,35 +102,35 @@ func (p *Pollster) WaitFD() (fd int64, mode int, err *os.Error) {
 	// Get an event.
 	var evarray [1]syscall.EpollEvent;
 	ev := &evarray[0];
-	n, e := syscall.epoll_wait(p.epfd, &evarray, -1)
+	n, e := syscall.epoll_wait(p.epfd, &evarray, -1);
 	for e == syscall.EAGAIN || e == syscall.EINTR {
 		n, e = syscall.epoll_wait(p.epfd, &evarray, -1)
 	}
 	if e != 0 {
 		return -1, 0, os.ErrnoToError(e)
 	}
-	fd = int64(ev.fd)
+	fd = int64(ev.fd);
 
 	if ev.events & Write != 0 {
-		p.StopWaiting(fd, Write)
+		p.StopWaiting(fd, Write);
 		return fd, 'w', nil
 	}
 	if ev.events & Read != 0 {
-		p.StopWaiting(fd, Read)
+		p.StopWaiting(fd, Read);
 		return fd, 'r', nil
 	}
 
 	// Other events are error conditions - wake whoever is waiting.
-	events, already := p.events[fd]
+	events, already := p.events[fd];
 	if events & Write != 0 {
-		p.StopWaiting(fd, Write)
+		p.StopWaiting(fd, Write);
 		return fd, 'w', nil
 	}
-	p.StopWaiting(fd, Read)
+	p.StopWaiting(fd, Read);
 	return fd, 'r', nil
 }
 
 func (p *Pollster) Close() *os.Error {
-	r, e := syscall.close(p.epfd)
+	r, e := syscall.close(p.epfd);
 	return os.ErrnoToError(e)
 }
diff --git a/src/lib/net/ip.go b/src/lib/net/ip.go
index 8c53d6f18..47134ca1f 100644
--- a/src/lib/net/ip.go
+++ b/src/lib/net/ip.go
@@ -19,7 +19,7 @@ export const (
 
 // Make the 4 bytes into an IPv4 address (in IPv6 form)
 func MakeIPv4(a, b, c, d byte) *[]byte {
-	p := new([]byte, IPv6len)
+	p := new([]byte, IPv6len);
 	for i := 0; i < 10; i++ {
 		p[i] = 0
 	}
@@ -28,7 +28,7 @@ func MakeIPv4(a, b, c, d byte) *[]byte {
 	p[12] = a;
 	p[13] = b;
 	p[14] = c;
-	p[15] = d
+	p[15] = d;
 	return p
 }
 
@@ -107,11 +107,11 @@ export func DefaultMask(p *[]byte) *[]byte {
 
 // Apply mask to ip, returning new address.
 export func Mask(ip *[]byte, mask *[]byte) *[]byte {
-	n := len(ip)
+	n := len(ip);
 	if n != len(mask) {
 		return nil
 	}
-	out := new([]byte, n)
+	out := new([]byte, n);
 	for i := 0; i < n; i++ {
 		out[i] = ip[i] & mask[i];
 	}
@@ -169,9 +169,9 @@ export func IPToString(p *[]byte) string {
 
 	// Find longest run of zeros.
 	e0 := -1;
-	e1 := -1
+	e1 := -1;
 	for i := 0; i < 16; i+=2 {
-		j := i
+		j := i;
 		for j < 16 && p[j] == 0 && p[j+1] == 0 {
 			j += 2
 		}
@@ -186,7 +186,7 @@ export func IPToString(p *[]byte) string {
 	for i := 0; i < 16; i += 2 {
 		if i == e0 {
 			s += "::";
-			i = e1
+			i = e1;
 			if i >= 16 {
 				break
 			}
@@ -201,16 +201,16 @@ export func IPToString(p *[]byte) string {
 // If mask is a sequence of 1 bits followed by 0 bits,
 // return the number of 1 bits.
 func SimpleMaskLength(mask *[]byte) int {
-	var i int
+	var i int;
 	for i = 0; i < len(mask); i++ {
 		if mask[i] != 0xFF {
 			break
 		}
 	}
 	n := 8*i;
-	v := mask[i]
+	v := mask[i];
 	for v & 0x80 != 0 {
-		n++
+		n++;
 		v <<= 1
 	}
 	if v != 0 {
@@ -227,12 +227,12 @@ func SimpleMaskLength(mask *[]byte) int {
 export func MaskToString(mask *[]byte) string {
 	switch len(mask) {
 	case 4:
-		n := SimpleMaskLength(mask)
+		n := SimpleMaskLength(mask);
 		if n >= 0 {
 			return itod(uint(n+(IPv6len-IPv4len)*8))
 		}
 	case 16:
-		n := SimpleMaskLength(mask)
+		n := SimpleMaskLength(mask);
 		if n >= 0 {
 			return itod(uint(n))
 		}
@@ -253,7 +253,7 @@ func dtoi(s string, i int) (n int, i1 int, ok bool) {
 	}
 	n = 0;
 	for ; i < len(s) && '0' <= s[i] && s[i] <= '9'; i++ {
-		n = n*10 + int(s[i] - '0')
+		n = n*10 + int(s[i] - '0');
 		if n >= Big {
 			return 0, i, false
 		}
@@ -277,7 +277,7 @@ func xtoi(s string, i int) (n int, i1 int, ok bool) {
 
 	n = 0;
 	for ; i < len(s) && ishex(s[i]); i++ {
-		n *= 16
+		n *= 16;
 		if '0' <= s[i] && s[i] <= '9' {
 			n += int(s[i] - '0')
 		} else if 'a' <= s[i] && s[i] <= 'f' {
@@ -294,20 +294,20 @@ func xtoi(s string, i int) (n int, i1 int, ok bool) {
 
 // Parse IPv4 address (d.d.d.d).
 func ParseIPv4(s string) *[]byte {
-	var p [IPv4len]byte
-	i := 0
+	var p [IPv4len]byte;
+	i := 0;
 	for j := 0; j < IPv4len; j++ {
 		if j > 0 {
 			if s[i] != '.' {
 				return nil
 			}
-			i++
+			i++;
 		}
 		var (
 			n int;
 			ok bool
 		)
-		n, i, ok = dtoi(s, i)
+		n, i, ok = dtoi(s, i);
 		if !ok || n > 0xFF {
 			return nil
 		}
@@ -335,7 +335,7 @@ func ParseIPv6(s string) *[]byte {
 	// Might have leading ellipsis
 	if len(s) >= 2 && s[0] == ':' && s[1] == ':' {
 		ellipsis = 0;
-		i = 2
+		i = 2;
 		// Might be only ellipsis
 		if i == len(s) {
 			return p
@@ -346,7 +346,7 @@ func ParseIPv6(s string) *[]byte {
 	j := 0;
 L:	for j < IPv6len {
 		// Hex number.
-		n, i1, ok := xtoi(s, i)
+		n, i1, ok := xtoi(s, i);
 		if !ok || n > 0xFFFF {
 			return nil
 		}
@@ -371,7 +371,7 @@ L:	for j < IPv6len {
 			p[j+2] = p4[14];
 			p[j+3] = p4[15];
 			i = len(s);
-			j += 4
+			j += 4;
 			break
 		}
 
@@ -381,7 +381,7 @@ L:	for j < IPv6len {
 		j += 2;
 
 		// Stop at end of string.
-		i = i1
+		i = i1;
 		if i == len(s) {
 			break
 		}
@@ -390,7 +390,7 @@ L:	for j < IPv6len {
 		if s[i] != ':' && i+1 == len(s) {
 			return nil
 		}
-		i++
+		i++;
 
 		// Look for ellipsis.
 		if s[i] == ':' {
@@ -414,7 +414,7 @@ L:	for j < IPv6len {
 		if ellipsis < 0 {
 			return nil
 		}
-		n := IPv6len - j
+		n := IPv6len - j;
 		for k := j-1; k >= ellipsis; k-- {
 			p[k+n] = p[k]
 		}
@@ -426,7 +426,7 @@ L:	for j < IPv6len {
 }
 
 export func ParseIP(s string) *[]byte {
-	p := ParseIPv4(s)
+	p := ParseIPv4(s);
 	if p != nil {
 		return p
 	}
diff --git a/src/lib/net/net.go b/src/lib/net/net.go
index 7df413055..49d9c1bcc 100644
--- a/src/lib/net/net.go
+++ b/src/lib/net/net.go
@@ -24,7 +24,7 @@ export var (
 // Host cannot contain colons unless it is bracketed.
 func SplitHostPort(hostport string) (host, port string, err *os.Error) {
 	// The port starts after the last colon.
-	var i int
+	var i int;
 	for i = len(hostport)-1; i >= 0; i-- {
 		if hostport[i] == ':' {
 			break
@@ -69,7 +69,7 @@ func xdtoi(s string) (n int, ok bool) {
 	}
 	n = 0;
 	for i := 0; i < len(s) && '0' <= s[i] && s[i] <= '9'; i++ {
-		n = n*10 + int(s[i] - '0')
+		n = n*10 + int(s[i] - '0');
 		if n >= 1000000 {	// bigger than we need
 			return 0, false
 		}
@@ -108,12 +108,12 @@ func HostPortToIP(net string, hostport string) (ip *[]byte, iport int, err *os.E
 func SockaddrToHostPort(sa *syscall.Sockaddr) (hostport string, err *os.Error) {
 	switch sa.family {
 	case syscall.AF_INET, syscall.AF_INET6:
-		addr, port, e := SockaddrToIP(sa)
+		addr, port, e := SockaddrToIP(sa);
 		if e != nil {
 			return "", e
 		}
 		host := IPToString(addr);
-		return JoinHostPort(host, strings.itoa(port)), nil
+		return JoinHostPort(host, strings.itoa(port)), nil;
 	default:
 		return "", UnknownSocketFamily
 	}
@@ -136,28 +136,28 @@ func Socket(f, p, t int64, la, ra *syscall.Sockaddr) (fd *FD, err *os.Error) {
 	}
 
 	// Allow reuse of recently-used addresses.
-	syscall.setsockopt_int(s, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1)
+	syscall.setsockopt_int(s, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1);
 
-	var r int64
+	var r int64;
 	if la != nil {
-		r, e = syscall.bind(s, la)
+		r, e = syscall.bind(s, la);
 		if e != 0 {
-			syscall.close(s)
+			syscall.close(s);
 			return nil, os.ErrnoToError(e)
 		}
 	}
 
 	if ra != nil {
-		r, e = syscall.connect(s, ra)
+		r, e = syscall.connect(s, ra);
 		if e != 0 {
-			syscall.close(s)
+			syscall.close(s);
 			return nil, os.ErrnoToError(e)
 		}
 	}
 
-	fd, err = NewFD(s)
+	fd, err = NewFD(s);
 	if err != nil {
-		syscall.close(s)
+		syscall.close(s);
 		return nil, err
 	}
 
@@ -179,12 +179,12 @@ func (c *ConnBase) FD() int64 {
 }
 
 func (c *ConnBase) Read(b *[]byte) (n int, err *os.Error) {
-	n, err = c.fd.Read(b)
+	n, err = c.fd.Read(b);
 	return n, err
 }
 
 func (c *ConnBase) Write(b *[]byte) (n int, err *os.Error) {
-	n, err = c.fd.Write(b)
+	n, err = c.fd.Write(b);
 	return n, err
 }
 
@@ -192,7 +192,7 @@ func (c *ConnBase) ReadFrom(b *[]byte) (n int, raddr string, err *os.Error) {
 	if c == nil {
 		return -1, "", os.EINVAL
 	}
-	n, err = c.Read(b)
+	n, err = c.Read(b);
 	return n, c.raddr, err
 }
 
@@ -203,7 +203,7 @@ func (c *ConnBase) WriteTo(raddr string, b *[]byte) (n int, err *os.Error) {
 	if raddr != c.raddr {
 		return -1, os.EINVAL
 	}
-	n, err = c.Write(b)
+	n, err = c.Write(b);
 	return n, err
 }
 
@@ -264,7 +264,7 @@ func (c *ConnBase) SetKeepAlive(keepalive bool) *os.Error {
 }
 
 func (c *ConnBase) SetLinger(sec int) *os.Error {
-	e := syscall.setsockopt_linger(c.FD(), syscall.SOL_SOCKET, syscall.SO_LINGER, sec)
+	e := syscall.setsockopt_linger(c.FD(), syscall.SOL_SOCKET, syscall.SO_LINGER, sec);
 	return os.ErrnoToError(e);
 }
 
@@ -281,24 +281,24 @@ const PreferIPv4 = false
 
 func InternetSocket(net, laddr, raddr string, proto int64) (fd *FD, err *os.Error) {
 	// Parse addresses (unless they are empty).
-	var lip, rip *[]byte
-	var lport, rport int
-	var lerr, rerr *os.Error
+	var lip, rip *[]byte;
+	var lport, rport int;
+	var lerr, rerr *os.Error;
 // BUG 6g doesn't zero var lists
 lip = nil;
 rip = nil;
 lport = 0;
 rport = 0;
 lerr = nil;
-rerr = nil
+rerr = nil;
 	if laddr != "" {
-		lip, lport, lerr = HostPortToIP(net, laddr)
+		lip, lport, lerr = HostPortToIP(net, laddr);
 		if lerr != nil {
 			return nil, lerr
 		}
 	}
 	if raddr != "" {
-		rip, rport, rerr = HostPortToIP(net, raddr)
+		rip, rport, rerr = HostPortToIP(net, raddr);
 		if rerr != nil {
 			return nil, rerr
 		}
@@ -309,9 +309,9 @@ rerr = nil
 	vers := 0;
 	switch net[len(net)-1] {
 	case '4':
-		vers = 4
+		vers = 4;
 	case '6':
-		vers = 6
+		vers = 6;
 	default:
 		// Otherwise, guess.
 		// If the addresses are IPv4 and we prefer IPv4, use 4; else 6.
@@ -324,8 +324,8 @@ rerr = nil
 		}
 	}
 
-	var cvt *(addr *[]byte, port int) (sa *syscall.Sockaddr, err *os.Error)
-	var family int64
+	var cvt *(addr *[]byte, port int) (sa *syscall.Sockaddr, err *os.Error);
+	var family int64;
 	if vers == 4 {
 		cvt = &IPv4ToSockaddr;
 		family = syscall.AF_INET
@@ -337,7 +337,7 @@ rerr = nil
 	var la, ra *syscall.Sockaddr;
 // BUG
 la = nil;
-ra = nil
+ra = nil;
 	if lip != nil {
 		la, lerr = cvt(lip, lport);
 		if lerr != nil {
@@ -372,19 +372,19 @@ func (c *ConnTCP) SetNoDelay(nodelay bool) *os.Error {
 
 // Wrappers
 func (c *ConnTCP) Read(b *[]byte) (n int, err *os.Error) {
-	n, err = (&c.base).Read(b)
+	n, err = (&c.base).Read(b);
 	return n, err
 }
 func (c *ConnTCP) Write(b *[]byte) (n int, err *os.Error) {
-	n, err = (&c.base).Write(b)
+	n, err = (&c.base).Write(b);
 	return n, err
 }
 func (c *ConnTCP) ReadFrom(b *[]byte) (n int, raddr string, err *os.Error) {
-	n, raddr, err = (&c.base).ReadFrom(b)
+	n, raddr, err = (&c.base).ReadFrom(b);
 	return n, raddr, err
 }
 func (c *ConnTCP) WriteTo(raddr string, b *[]byte) (n int, err *os.Error) {
-	n, err = (&c.base).WriteTo(raddr, b)
+	n, err = (&c.base).WriteTo(raddr, b);
 	return n, err
 }
 func (c *ConnTCP) Close() *os.Error {
@@ -433,7 +433,7 @@ export func DialTCP(net, laddr, raddr string) (c *ConnTCP, err *os.Error) {
 	if raddr == "" {
 		return nil, MissingAddress
 	}
-	fd, e := InternetSocket(net, laddr, raddr, syscall.SOCK_STREAM)
+	fd, e := InternetSocket(net, laddr, raddr, syscall.SOCK_STREAM);
 	if e != nil {
 		return nil, e
 	}
@@ -499,23 +499,23 @@ var noconn NoConn
 export func Dial(net, laddr, raddr string) (c Conn, err *os.Error) {
 	switch net {
 	case "tcp", "tcp4", "tcp6":
-		c, err := DialTCP(net, laddr, raddr)
+		c, err := DialTCP(net, laddr, raddr);
 		if err != nil {
 			return &noconn, err
 		}
-		return c, nil
+		return c, nil;
 /*
 	case "udp", "udp4", "upd6":
-		c, err := DialUDP(net, laddr, raddr)
-		return c, err
+		c, err := DialUDP(net, laddr, raddr);
+		return c, err;
 	case "ether":
-		c, err := DialEther(net, laddr, raddr)
-		return c, err
+		c, err := DialEther(net, laddr, raddr);
+		return c, err;
 	case "ipv4":
-		c, err := DialIPv4(net, laddr, raddr)
-		return c, err
+		c, err := DialIPv4(net, laddr, raddr);
+		return c, err;
 	case "ipv6":
-		c, err := DialIPv6(net, laddr, raddr)
+		c, err := DialIPv6(net, laddr, raddr);
 		return c, err
 */
 	}
@@ -542,17 +542,17 @@ export type ListenerTCP struct {
 }
 
 export func ListenTCP(net, laddr string) (l *ListenerTCP, err *os.Error) {
-	fd, e := InternetSocket(net, laddr, "", syscall.SOCK_STREAM)
+	fd, e := InternetSocket(net, laddr, "", syscall.SOCK_STREAM);
 	if e != nil {
 		return nil, e
 	}
-	r, e1 := syscall.listen(fd.fd, ListenBacklog())
+	r, e1 := syscall.listen(fd.fd, ListenBacklog());
 	if e1 != 0 {
-		syscall.close(fd.fd)
+		syscall.close(fd.fd);
 		return nil, os.ErrnoToError(e1)
 	}
 	l = new(ListenerTCP);
-	l.fd = fd
+	l.fd = fd;
 	return l, nil
 }
 
@@ -561,20 +561,20 @@ func (l *ListenerTCP) AcceptTCP() (c *ConnTCP, raddr string, err *os.Error) {
 		return nil, "", os.EINVAL
 	}
 	var sa syscall.Sockaddr;
-	fd, e := l.fd.Accept(&sa)
+	fd, e := l.fd.Accept(&sa);
 	if e != nil {
 		return nil, "", e
 	}
-	raddr, err = SockaddrToHostPort(&sa)
+	raddr, err = SockaddrToHostPort(&sa);
 	if err != nil {
-		fd.Close()
+		fd.Close();
 		return nil, "", err
 	}
 	return NewConnTCP(fd, raddr), raddr, nil
 }
 
 func (l *ListenerTCP) Accept() (c Conn, raddr string, err *os.Error) {
-	c1, r1, e1 := l.AcceptTCP()
+	c1, r1, e1 := l.AcceptTCP();
 	if e1 != nil {
 		return &noconn, "", e1
 	}
@@ -591,7 +591,7 @@ func (l *ListenerTCP) Close() *os.Error {
 export func Listen(net, laddr string) (l Listener, err *os.Error) {
 	switch net {
 	case "tcp", "tcp4", "tcp6":
-		l, err := ListenTCP(net, laddr)
+		l, err := ListenTCP(net, laddr);
 		if err != nil {
 			return &nolistener, err
 		}
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
 	}
diff --git a/src/lib/net/net_linux.go b/src/lib/net/net_linux.go
index 17ffa5a9e..a7c1ecc00 100644
--- a/src/lib/net/net_linux.go
+++ b/src/lib/net/net_linux.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
 	}
@@ -28,7 +28,7 @@ export func IPv4ToSockaddr(p *[]byte, port int) (sa1 *syscall.Sockaddr, err *os.
 var IPv6zero [16]byte;
 
 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
 	}
@@ -54,18 +54,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
 	}