1 files changed, 58 insertions, 58 deletions
diff --git a/src/pkg/net/sock.go b/src/pkg/net/sock.go
index 336c96866..dbb87d36f 100644
--- a/src/pkg/net/sock.go
+++ b/src/pkg/net/sock.go
@@ -7,9 +7,9 @@
 package net
 
 import (
-	"os";
-	"reflect";
-	"syscall";
+	"os"
+	"reflect"
+	"syscall"
 )
 
 // Boolean to int.
@@ -17,52 +17,52 @@ func boolint(b bool) int {
 	if b {
 		return 1
 	}
-	return 0;
+	return 0
 }
 
 // Generic socket creation.
 func socket(net string, f, p, t int, la, ra syscall.Sockaddr, toAddr func(syscall.Sockaddr) Addr) (fd *netFD, err os.Error) {
 	// See ../syscall/exec.go for description of ForkLock.
-	syscall.ForkLock.RLock();
-	s, e := syscall.Socket(f, p, t);
+	syscall.ForkLock.RLock()
+	s, e := syscall.Socket(f, p, t)
 	if e != 0 {
-		syscall.ForkLock.RUnlock();
-		return nil, os.Errno(e);
+		syscall.ForkLock.RUnlock()
+		return nil, os.Errno(e)
 	}
-	syscall.CloseOnExec(s);
-	syscall.ForkLock.RUnlock();
+	syscall.CloseOnExec(s)
+	syscall.ForkLock.RUnlock()
 
 	// Allow reuse of recently-used addresses.
-	syscall.SetsockoptInt(s, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1);
+	syscall.SetsockoptInt(s, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, 1)
 
 	if la != nil {
-		e = syscall.Bind(s, la);
+		e = syscall.Bind(s, la)
 		if e != 0 {
-			syscall.Close(s);
-			return nil, os.Errno(e);
+			syscall.Close(s)
+			return nil, os.Errno(e)
 		}
 	}
 
 	if ra != nil {
-		e = syscall.Connect(s, ra);
+		e = syscall.Connect(s, ra)
 		if e != 0 {
-			syscall.Close(s);
-			return nil, os.Errno(e);
+			syscall.Close(s)
+			return nil, os.Errno(e)
 		}
 	}
 
-	sa, _ := syscall.Getsockname(s);
-	laddr := toAddr(sa);
-	sa, _ = syscall.Getpeername(s);
-	raddr := toAddr(sa);
+	sa, _ := syscall.Getsockname(s)
+	laddr := toAddr(sa)
+	sa, _ = syscall.Getpeername(s)
+	raddr := toAddr(sa)
 
-	fd, err = newFD(s, f, p, net, laddr, raddr);
+	fd, err = newFD(s, f, p, net, laddr, raddr)
 	if err != nil {
-		syscall.Close(s);
-		return nil, err;
+		syscall.Close(s)
+		return nil, err
 	}
 
-	return fd, nil;
+	return fd, nil
 }
 
 func setsockoptInt(fd, level, opt int, value int) os.Error {
@@ -70,43 +70,43 @@ func setsockoptInt(fd, level, opt int, value int) os.Error {
 }
 
 func setsockoptNsec(fd, level, opt int, nsec int64) os.Error {
-	var tv = syscall.NsecToTimeval(nsec);
-	return os.NewSyscallError("setsockopt", syscall.SetsockoptTimeval(fd, level, opt, &tv));
+	var tv = syscall.NsecToTimeval(nsec)
+	return os.NewSyscallError("setsockopt", syscall.SetsockoptTimeval(fd, level, opt, &tv))
 }
 
 func setReadBuffer(fd *netFD, bytes int) os.Error {
-	fd.incref();
-	defer fd.decref();
-	return setsockoptInt(fd.sysfd, syscall.SOL_SOCKET, syscall.SO_RCVBUF, bytes);
+	fd.incref()
+	defer fd.decref()
+	return setsockoptInt(fd.sysfd, syscall.SOL_SOCKET, syscall.SO_RCVBUF, bytes)
 }
 
 func setWriteBuffer(fd *netFD, bytes int) os.Error {
-	fd.incref();
-	defer fd.decref();
-	return setsockoptInt(fd.sysfd, syscall.SOL_SOCKET, syscall.SO_SNDBUF, bytes);
+	fd.incref()
+	defer fd.decref()
+	return setsockoptInt(fd.sysfd, syscall.SOL_SOCKET, syscall.SO_SNDBUF, bytes)
 }
 
 func setReadTimeout(fd *netFD, nsec int64) os.Error {
-	fd.rdeadline_delta = nsec;
-	return nil;
+	fd.rdeadline_delta = nsec
+	return nil
 }
 
 func setWriteTimeout(fd *netFD, nsec int64) os.Error {
-	fd.wdeadline_delta = nsec;
-	return nil;
+	fd.wdeadline_delta = nsec
+	return nil
 }
 
 func setTimeout(fd *netFD, nsec int64) os.Error {
 	if e := setReadTimeout(fd, nsec); e != nil {
 		return e
 	}
-	return setWriteTimeout(fd, nsec);
+	return setWriteTimeout(fd, nsec)
 }
 
 func setReuseAddr(fd *netFD, reuse bool) os.Error {
-	fd.incref();
-	defer fd.decref();
-	return setsockoptInt(fd.sysfd, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, boolint(reuse));
+	fd.incref()
+	defer fd.decref()
+	return setsockoptInt(fd.sysfd, syscall.SOL_SOCKET, syscall.SO_REUSEADDR, boolint(reuse))
 }
 
 func bindToDevice(fd *netFD, dev string) os.Error {
@@ -115,34 +115,34 @@ func bindToDevice(fd *netFD, dev string) os.Error {
 }
 
 func setDontRoute(fd *netFD, dontroute bool) os.Error {
-	fd.incref();
-	defer fd.decref();
-	return setsockoptInt(fd.sysfd, syscall.SOL_SOCKET, syscall.SO_DONTROUTE, boolint(dontroute));
+	fd.incref()
+	defer fd.decref()
+	return setsockoptInt(fd.sysfd, syscall.SOL_SOCKET, syscall.SO_DONTROUTE, boolint(dontroute))
 }
 
 func setKeepAlive(fd *netFD, keepalive bool) os.Error {
-	fd.incref();
-	defer fd.decref();
-	return setsockoptInt(fd.sysfd, syscall.SOL_SOCKET, syscall.SO_KEEPALIVE, boolint(keepalive));
+	fd.incref()
+	defer fd.decref()
+	return setsockoptInt(fd.sysfd, syscall.SOL_SOCKET, syscall.SO_KEEPALIVE, boolint(keepalive))
 }
 
 func setLinger(fd *netFD, sec int) os.Error {
-	var l syscall.Linger;
+	var l syscall.Linger
 	if sec >= 0 {
-		l.Onoff = 1;
-		l.Linger = int32(sec);
+		l.Onoff = 1
+		l.Linger = int32(sec)
 	} else {
-		l.Onoff = 0;
-		l.Linger = 0;
+		l.Onoff = 0
+		l.Linger = 0
 	}
-	fd.incref();
-	defer fd.decref();
-	e := syscall.SetsockoptLinger(fd.sysfd, syscall.SOL_SOCKET, syscall.SO_LINGER, &l);
-	return os.NewSyscallError("setsockopt", e);
+	fd.incref()
+	defer fd.decref()
+	e := syscall.SetsockoptLinger(fd.sysfd, syscall.SOL_SOCKET, syscall.SO_LINGER, &l)
+	return os.NewSyscallError("setsockopt", e)
 }
 
 type UnknownSocketError struct {
-	sa syscall.Sockaddr;
+	sa syscall.Sockaddr
 }
 
 func (e *UnknownSocketError) String() string {
@@ -159,5 +159,5 @@ func sockaddrToString(sa syscall.Sockaddr) (name string, err os.Error) {
 		return a.Name, nil
 	}
 
-	return "", &UnknownSocketError{sa};
+	return "", &UnknownSocketError{sa}
 }