diff options
author | Russ Cox <rsc@golang.org> | 2008-10-07 12:31:31 -0700 |
---|---|---|
committer | Russ Cox <rsc@golang.org> | 2008-10-07 12:31:31 -0700 |
commit | 2e35ca6c33cd9c089b6536e9405e2f90a8ec101c (patch) | |
tree | 133422e9724c37fc7aac2fcf9f1c52b230af51ef /src/lib/os | |
parent | 5cff795078a27a56b69a1fa878b3b72be12b60a6 (diff) | |
download | golang-2e35ca6c33cd9c089b6536e9405e2f90a8ec101c.tar.gz |
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
Diffstat (limited to 'src/lib/os')
-rw-r--r-- | src/lib/os/os_error.go | 4 | ||||
-rw-r--r-- | src/lib/os/os_file.go | 2 | ||||
-rw-r--r-- | src/lib/os/os_time.go | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/os/os_error.go b/src/lib/os/os_error.go index 95a671497..dee135784 100644 --- a/src/lib/os/os_error.go +++ b/src/lib/os/os_error.go @@ -16,7 +16,7 @@ var ErrorTab = new(map[int64] *Error); export func NewError(s string) *Error { e := new(Error); - e.s = s + e.s = s; return e } @@ -24,7 +24,7 @@ export func ErrnoToError(errno int64) *Error { if errno == 0 { return nil } - err, ok := ErrorTab[errno] + err, ok := ErrorTab[errno]; if ok { return err } diff --git a/src/lib/os/os_file.go b/src/lib/os/os_file.go index 0b1d2e0df..3fa62ba7c 100644 --- a/src/lib/os/os_file.go +++ b/src/lib/os/os_file.go @@ -84,7 +84,7 @@ func (fd *FD) WriteString(s string) (ret int, err *Error) { } export func Pipe() (fd1 *FD, fd2 *FD, err *Error) { - var p [2]int64 + var p [2]int64; r, e := syscall.pipe(&p); if e != 0 { return nil, nil, ErrnoToError(e) diff --git a/src/lib/os/os_time.go b/src/lib/os/os_time.go index 2efd4a5d0..b396eafab 100644 --- a/src/lib/os/os_time.go +++ b/src/lib/os/os_time.go @@ -11,7 +11,7 @@ import ( export func Time() (sec int64, nsec int64, err *Error) { var errno int64; - sec, nsec, errno = syscall.gettimeofday() + sec, nsec, errno = syscall.gettimeofday(); if errno != 0 { return 0, 0, ErrnoToError(errno) } |