- fine-tuning of one-line func heuristic (nodes.go)

- enabled for function declarations (not just function literals)
- applied gofmt -w $GOROOT/src
(look for instance at src/pkg/debug/elf/elf.go)

R=r, rsc
CC=go-dev
http://go/go-review/1026006

14 files changed, 70 insertions, 203 deletions

diff --git a/src/pkg/syscall/exec.go b/src/pkg/syscall/exec.go
index eb577f326..4310b9e1a 100644
--- a/src/pkg/syscall/exec.go
+++ b/src/pkg/syscall/exec.go
@@ -71,9 +71,7 @@ func StringArrayPtr(ss []string) []*byte {
 	return bb;
 }
 
-func CloseOnExec(fd int) {
-	fcntl(fd, F_SETFD, FD_CLOEXEC);
-}
+func CloseOnExec(fd int)	{ fcntl(fd, F_SETFD, FD_CLOEXEC) }
 
 func SetNonblock(fd int, nonblocking bool) (errno int) {
 	flag, err := fcntl(fd, F_GETFL, 0);
diff --git a/src/pkg/syscall/syscall.go b/src/pkg/syscall/syscall.go
index c19135255..89252d1f8 100644
--- a/src/pkg/syscall/syscall.go
+++ b/src/pkg/syscall/syscall.go
@@ -27,6 +27,4 @@ func StringByteSlice(s string) []byte {
 
 // StringBytePtr returns a pointer to a NUL-terminated array of bytes
 // containing the text of s.
-func StringBytePtr(s string) *byte {
-	return &StringByteSlice(s)[0];
-}
+func StringBytePtr(s string) *byte	{ return &StringByteSlice(s)[0] }
diff --git a/src/pkg/syscall/syscall_darwin.go b/src/pkg/syscall/syscall_darwin.go
index 21900554b..792dc0bbc 100644
--- a/src/pkg/syscall/syscall_darwin.go
+++ b/src/pkg/syscall/syscall_darwin.go
@@ -23,9 +23,7 @@ const OS = "darwin"
 // even linking this function into the binary.  See ../os/getwd.go.
 const ImplementsGetwd = false
 
-func Getwd() (string, int) {
-	return "", ENOTSUP;
-}
+func Getwd() (string, int)	{ return "", ENOTSUP }
 
 
 /*
@@ -90,9 +88,7 @@ const (
 	stopped	= 0x7F;
 )
 
-func (w WaitStatus) Exited() bool {
-	return w&mask == exited;
-}
+func (w WaitStatus) Exited() bool	{ return w&mask == exited }
 
 func (w WaitStatus) ExitStatus() int {
 	if w&mask != exited {
@@ -101,9 +97,7 @@ func (w WaitStatus) ExitStatus() int {
 	return int(w>>shift);
 }
 
-func (w WaitStatus) Signaled() bool {
-	return w&mask != stopped && w&mask != 0;
-}
+func (w WaitStatus) Signaled() bool	{ return w&mask != stopped && w&mask != 0 }
 
 func (w WaitStatus) Signal() int {
 	sig := int(w&mask);
@@ -113,17 +107,11 @@ func (w WaitStatus) Signal() int {
 	return sig;
 }
 
-func (w WaitStatus) CoreDump() bool {
-	return w.Signaled() && w&core != 0;
-}
+func (w WaitStatus) CoreDump() bool	{ return w.Signaled() && w&core != 0 }
 
-func (w WaitStatus) Stopped() bool {
-	return w&mask == stopped && w>>shift != SIGSTOP;
-}
+func (w WaitStatus) Stopped() bool	{ return w&mask == stopped && w>>shift != SIGSTOP }
 
-func (w WaitStatus) Continued() bool {
-	return w&mask == stopped && w>>shift == SIGSTOP;
-}
+func (w WaitStatus) Continued() bool	{ return w&mask == stopped && w>>shift == SIGSTOP }
 
 func (w WaitStatus) StopSignal() int {
 	if !w.Stopped() {
diff --git a/src/pkg/syscall/syscall_darwin_386.go b/src/pkg/syscall/syscall_darwin_386.go
index 5654e09da..41b7578e3 100644
--- a/src/pkg/syscall/syscall_darwin_386.go
+++ b/src/pkg/syscall/syscall_darwin_386.go
@@ -4,13 +4,9 @@
 
 package syscall
 
-func Getpagesize() int {
-	return 4096;
-}
+func Getpagesize() int	{ return 4096 }
 
-func TimespecToNsec(ts Timespec) int64 {
-	return int64(ts.Sec)*1e9 + int64(ts.Nsec);
-}
+func TimespecToNsec(ts Timespec) int64	{ return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
 
 func NsecToTimespec(nsec int64) (ts Timespec) {
 	ts.Sec = int32(nsec/1e9);
@@ -18,9 +14,7 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return;
 }
 
-func TimevalToNsec(tv Timeval) int64 {
-	return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3;
-}
+func TimevalToNsec(tv Timeval) int64	{ return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
 
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999;	// round up to microsecond
diff --git a/src/pkg/syscall/syscall_darwin_amd64.go b/src/pkg/syscall/syscall_darwin_amd64.go
index 7522069b1..7662b200d 100644
--- a/src/pkg/syscall/syscall_darwin_amd64.go
+++ b/src/pkg/syscall/syscall_darwin_amd64.go
@@ -4,13 +4,9 @@
 
 package syscall
 
-func Getpagesize() int {
-	return 4096;
-}
+func Getpagesize() int	{ return 4096 }
 
-func TimespecToNsec(ts Timespec) int64 {
-	return int64(ts.Sec)*1e9 + int64(ts.Nsec);
-}
+func TimespecToNsec(ts Timespec) int64	{ return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
 
 func NsecToTimespec(nsec int64) (ts Timespec) {
 	ts.Sec = nsec/1e9;
@@ -18,9 +14,7 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return;
 }
 
-func TimevalToNsec(tv Timeval) int64 {
-	return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3;
-}
+func TimevalToNsec(tv Timeval) int64	{ return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
 
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999;	// round up to microsecond
diff --git a/src/pkg/syscall/syscall_linux.go b/src/pkg/syscall/syscall_linux.go
index 900889df6..e4b82569e 100644
--- a/src/pkg/syscall/syscall_linux.go
+++ b/src/pkg/syscall/syscall_linux.go
@@ -120,25 +120,15 @@ const (
 	shift	= 8;
 )
 
-func (w WaitStatus) Exited() bool {
-	return w&mask == exited;
-}
+func (w WaitStatus) Exited() bool	{ return w&mask == exited }
 
-func (w WaitStatus) Signaled() bool {
-	return w&mask != stopped && w&mask != exited;
-}
+func (w WaitStatus) Signaled() bool	{ return w&mask != stopped && w&mask != exited }
 
-func (w WaitStatus) Stopped() bool {
-	return w&0xFF == stopped;
-}
+func (w WaitStatus) Stopped() bool	{ return w&0xFF == stopped }
 
-func (w WaitStatus) Continued() bool {
-	return w == 0xFFFF;
-}
+func (w WaitStatus) Continued() bool	{ return w == 0xFFFF }
 
-func (w WaitStatus) CoreDump() bool {
-	return w.Signaled() && w&core != 0;
-}
+func (w WaitStatus) CoreDump() bool	{ return w.Signaled() && w&core != 0 }
 
 func (w WaitStatus) ExitStatus() int {
 	if !w.Exited() {
@@ -536,17 +526,11 @@ func PtraceCont(pid int, signal int) (errno int) {
 	return ptrace(PTRACE_CONT, pid, 0, uintptr(signal));
 }
 
-func PtraceSingleStep(pid int) (errno int) {
-	return ptrace(PTRACE_SINGLESTEP, pid, 0, 0);
-}
+func PtraceSingleStep(pid int) (errno int)	{ return ptrace(PTRACE_SINGLESTEP, pid, 0, 0) }
 
-func PtraceAttach(pid int) (errno int) {
-	return ptrace(PTRACE_ATTACH, pid, 0, 0);
-}
+func PtraceAttach(pid int) (errno int)	{ return ptrace(PTRACE_ATTACH, pid, 0, 0) }
 
-func PtraceDetach(pid int) (errno int) {
-	return ptrace(PTRACE_DETACH, pid, 0, 0);
-}
+func PtraceDetach(pid int) (errno int)	{ return ptrace(PTRACE_DETACH, pid, 0, 0) }
 
 // Sendto
 // Recvfrom
diff --git a/src/pkg/syscall/syscall_linux_386.go b/src/pkg/syscall/syscall_linux_386.go
index 796859c0a..9632a889e 100644
--- a/src/pkg/syscall/syscall_linux_386.go
+++ b/src/pkg/syscall/syscall_linux_386.go
@@ -6,13 +6,9 @@ package syscall
 
 import "unsafe"
 
-func Getpagesize() int {
-	return 4096;
-}
+func Getpagesize() int	{ return 4096 }
 
-func TimespecToNsec(ts Timespec) int64 {
-	return int64(ts.Sec)*1e9 + int64(ts.Nsec);
-}
+func TimespecToNsec(ts Timespec) int64	{ return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
 
 func NsecToTimespec(nsec int64) (ts Timespec) {
 	ts.Sec = int32(nsec/1e9);
@@ -20,9 +16,7 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return;
 }
 
-func TimevalToNsec(tv Timeval) int64 {
-	return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3;
-}
+func TimevalToNsec(tv Timeval) int64	{ return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
 
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999;	// round up to microsecond
@@ -151,10 +145,6 @@ func Listen(s int, n int) (errno int) {
 	return;
 }
 
-func (r *PtraceRegs) PC() uint64 {
-	return uint64(uint32(r.Eip));
-}
+func (r *PtraceRegs) PC() uint64	{ return uint64(uint32(r.Eip)) }
 
-func (r *PtraceRegs) SetPC(pc uint64) {
-	r.Eip = int32(pc);
-}
+func (r *PtraceRegs) SetPC(pc uint64)	{ r.Eip = int32(pc) }
diff --git a/src/pkg/syscall/syscall_linux_amd64.go b/src/pkg/syscall/syscall_linux_amd64.go
index 685fc1b48..3ad3f3a2b 100644
--- a/src/pkg/syscall/syscall_linux_amd64.go
+++ b/src/pkg/syscall/syscall_linux_amd64.go
@@ -42,13 +42,9 @@ package syscall
 //sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, errno int)
 //sys	sendto(s int, buf []byte, flags int, to uintptr, addrlen _Socklen) (errno int)
 
-func Getpagesize() int {
-	return 4096;
-}
+func Getpagesize() int	{ return 4096 }
 
-func TimespecToNsec(ts Timespec) int64 {
-	return int64(ts.Sec)*1e9 + int64(ts.Nsec);
-}
+func TimespecToNsec(ts Timespec) int64	{ return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
 
 func NsecToTimespec(nsec int64) (ts Timespec) {
 	ts.Sec = nsec/1e9;
@@ -56,9 +52,7 @@ func NsecToTimespec(nsec int64) (ts Timespec) {
 	return;
 }
 
-func TimevalToNsec(tv Timeval) int64 {
-	return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3;
-}
+func TimevalToNsec(tv Timeval) int64	{ return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
 
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	nsec += 999;	// round up to microsecond
@@ -67,10 +61,6 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
 	return;
 }
 
-func (r *PtraceRegs) PC() uint64 {
-	return r.Rip;
-}
+func (r *PtraceRegs) PC() uint64	{ return r.Rip }
 
-func (r *PtraceRegs) SetPC(pc uint64) {
-	r.Rip = pc;
-}
+func (r *PtraceRegs) SetPC(pc uint64)	{ r.Rip = pc }
diff --git a/src/pkg/syscall/syscall_linux_arm.go b/src/pkg/syscall/syscall_linux_arm.go
index d71b2e154..36f19906a 100644
--- a/src/pkg/syscall/syscall_linux_arm.go
+++ b/src/pkg/syscall/syscall_linux_arm.go
@@ -4,13 +4,9 @@
 
 package syscall
 
-func Getpagesize() int {
-	return 4096;
-}
+func Getpagesize() int	{ return 4096 }
 
-func TimespecToNsec(ts Timespec) int64 {
-	return int64(ts.Sec)*1e9 + int64(ts.Nsec);
-}
+func TimespecToNsec(ts Timespec) int64	{ return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
 
 func NsecToTimespec(nsec int64) (ts Timespec) {
 	ts.Sec = int32(nsec/1e9);
@@ -62,9 +58,6 @@ func NsecToTimeval(nsec int64) (tv Timeval) {
 //sys	Statfs(path string, buf *Statfs_t) (errno int)
 
 // TODO(kaib): add support for tracing
-func (r *PtraceRegs) PC() uint64 {
-	return 0;
-}
+func (r *PtraceRegs) PC() uint64	{ return 0 }
 
-func (r *PtraceRegs) SetPC(pc uint64) {
-}
+func (r *PtraceRegs) SetPC(pc uint64)	{}
diff --git a/src/pkg/syscall/syscall_nacl.go b/src/pkg/syscall/syscall_nacl.go
index 3efea2e96..9b3266809 100644
--- a/src/pkg/syscall/syscall_nacl.go
+++ b/src/pkg/syscall/syscall_nacl.go
@@ -114,9 +114,7 @@ const (
 	SIGTRAP = 5;
 )
 
-func Pipe(p []int) (errno int) {
-	return ENACL;
-}
+func Pipe(p []int) (errno int)	{ return ENACL }
 
 func fcntl(fd, cmd, arg int) (val int, errno int) {
 	return 0, ENACL;
@@ -130,45 +128,31 @@ func Pwrite(fd int, p []byte, offset int64) (n int, errno int) {
 	return 0, ENACL;
 }
 
-func Mkdir(path string, mode int) (errno int) {
-	return ENACL;
-}
+func Mkdir(path string, mode int) (errno int)	{ return ENACL }
 
 func Lstat(path string, stat *Stat_t) (errno int) {
 	return ENACL;
 }
 
-func Chdir(path string) (errno int) {
-	return ENACL;
-}
+func Chdir(path string) (errno int)	{ return ENACL }
 
-func Fchdir(fd int) (errno int) {
-	return ENACL;
-}
+func Fchdir(fd int) (errno int)	{ return ENACL }
 
-func Unlink(path string) (errno int) {
-	return ENACL;
-}
+func Unlink(path string) (errno int)	{ return ENACL }
 
-func Rmdir(path string) (errno int) {
-	return ENACL;
-}
+func Rmdir(path string) (errno int)	{ return ENACL }
 
 func Link(oldpath, newpath string) (errno int) {
 	return ENACL;
 }
 
-func Symlink(path, link string) (errno int) {
-	return ENACL;
-}
+func Symlink(path, link string) (errno int)	{ return ENACL }
 
 func Readlink(path string, buf []byte) (n int, errno int) {
 	return 0, ENACL;
 }
 
-func Fchmod(fd int, mode int) (errno int) {
-	return ENACL;
-}
+func Fchmod(fd int, mode int) (errno int)	{ return ENACL }
 
 func Chown(path string, uid int, gid int) (errno int) {
 	return ENACL;
@@ -196,33 +180,19 @@ func Ftruncate(fd int, length int64) (errno int) {
 
 const ImplementsGetwd = true
 
-func Getwd() (wd string, errno int) {
-	return "", ENACL;
-}
+func Getwd() (wd string, errno int)	{ return "", ENACL }
 
-func Getuid() (uid int) {
-	return -1;
-}
+func Getuid() (uid int)	{ return -1 }
 
-func Geteuid() (euid int) {
-	return -1;
-}
+func Geteuid() (euid int)	{ return -1 }
 
-func Getgid() (gid int) {
-	return -1;
-}
+func Getgid() (gid int)	{ return -1 }
 
-func Getegid() (egid int) {
-	return -1;
-}
+func Getegid() (egid int)	{ return -1 }
 
-func Getppid() (ppid int) {
-	return -1;
-}
+func Getppid() (ppid int)	{ return -1 }
 
-func Getgroups() (gids []int, errno int) {
-	return nil, ENACL;
-}
+func Getgroups() (gids []int, errno int)	{ return nil, ENACL }
 
 type Sockaddr interface {
 	sockaddr();
@@ -233,23 +203,20 @@ type SockaddrInet4 struct {
 	Addr	[4]byte;
 }
 
-func (*SockaddrInet4) sockaddr() {
-}
+func (*SockaddrInet4) sockaddr()	{}
 
 type SockaddrInet6 struct {
 	Port	int;
 	Addr	[16]byte;
 }
 
-func (*SockaddrInet6) sockaddr() {
-}
+func (*SockaddrInet6) sockaddr()	{}
 
 type SockaddrUnix struct {
 	Name string;
 }
 
-func (*SockaddrUnix) sockaddr() {
-}
+func (*SockaddrUnix) sockaddr()	{}
 
 const (
 	AF_INET	= 1+iota;
@@ -284,13 +251,9 @@ func Getpeername(fd int) (sa Sockaddr, errno int) {
 	return nil, ENACL;
 }
 
-func Bind(fd int, sa Sockaddr) (errno int) {
-	return ENACL;
-}
+func Bind(fd int, sa Sockaddr) (errno int)	{ return ENACL }
 
-func Connect(fd int, sa Sockaddr) (errno int) {
-	return ENACL;
-}
+func Connect(fd int, sa Sockaddr) (errno int)	{ return ENACL }
 
 func Socket(domain, typ, proto int) (fd, errno int) {
 	return 0, ENACL;
@@ -313,9 +276,7 @@ func SetsockoptLinger(fd, level, opt int, l *Linger) (errno int) {
 	return ENACL;
 }
 
-func Listen(s int, n int) (errno int) {
-	return ENACL;
-}
+func Listen(s int, n int) (errno int)	{ return ENACL }
 
 type Rusage struct {
 	Utime		Timeval;
@@ -342,38 +303,20 @@ func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int,
 
 type WaitStatus uint32
 
-func (WaitStatus) Exited() bool {
-	return false;
-}
+func (WaitStatus) Exited() bool	{ return false }
 
-func (WaitStatus) ExitStatus() int {
-	return -1;
-}
+func (WaitStatus) ExitStatus() int	{ return -1 }
 
-func (WaitStatus) Signal() int {
-	return -1;
-}
+func (WaitStatus) Signal() int	{ return -1 }
 
-func (WaitStatus) CoreDump() bool {
-	return false;
-}
+func (WaitStatus) CoreDump() bool	{ return false }
 
-func (WaitStatus) Stopped() bool {
-	return false;
-}
+func (WaitStatus) Stopped() bool	{ return false }
 
-func (WaitStatus) Continued() bool {
-	return false;
-}
+func (WaitStatus) Continued() bool	{ return false }
 
-func (WaitStatus) StopSignal() int {
-	return -1;
-}
+func (WaitStatus) StopSignal() int	{ return -1 }
 
-func (WaitStatus) Signaled() bool {
-	return false;
-}
+func (WaitStatus) Signaled() bool	{ return false }
 
-func (WaitStatus) TrapCause() int {
-	return -1;
-}
+func (WaitStatus) TrapCause() int	{ return -1 }
diff --git a/src/pkg/syscall/syscall_nacl_386.go b/src/pkg/syscall/syscall_nacl_386.go
index e87c1ffbf..badc4b25b 100644
--- a/src/pkg/syscall/syscall_nacl_386.go
+++ b/src/pkg/syscall/syscall_nacl_386.go
@@ -4,9 +4,7 @@
 
 package syscall
 
-func Getpagesize() int {
-	return 4096;
-}
+func Getpagesize() int	{ return 4096 }
 
 func NsecToTimeval(nsec int64) (tv Timeval) {
 	tv.Sec = int32(nsec/1e9);
diff --git a/src/pkg/syscall/zsysnum_linux_386.go b/src/pkg/syscall/zsysnum_linux_386.go
index 02691b856..d0d743f3e 100644
--- a/src/pkg/syscall/zsysnum_linux_386.go
+++ b/src/pkg/syscall/zsysnum_linux_386.go
@@ -315,5 +315,4 @@ const (
 	SYS_FALLOCATE			= 324;
 )
 
-func _darwin_system_call_conflict() {
-}
+func _darwin_system_call_conflict()	{}
diff --git a/src/pkg/syscall/zsysnum_linux_amd64.go b/src/pkg/syscall/zsysnum_linux_amd64.go
index 74faa9578..055e65b5d 100644
--- a/src/pkg/syscall/zsysnum_linux_amd64.go
+++ b/src/pkg/syscall/zsysnum_linux_amd64.go
@@ -292,5 +292,4 @@ const (
 	SYS_FALLOCATE			= 285;
 )
 
-func _darwin_system_call_conflict() {
-}
+func _darwin_system_call_conflict()	{}
diff --git a/src/pkg/syscall/zsysnum_linux_arm.go b/src/pkg/syscall/zsysnum_linux_arm.go
index a493bfe9c..d1936c049 100644
--- a/src/pkg/syscall/zsysnum_linux_arm.go
+++ b/src/pkg/syscall/zsysnum_linux_arm.go
@@ -333,5 +333,4 @@ const (
 	SYS_INOTIFY_INIT1		= (SYS_SYSCALL_BASE + 360);
 )
 
-func _darwin_system_call_conflict() {
-}
+func _darwin_system_call_conflict()	{}