diff options
| author | Rob Pike <r@golang.org> | 2009-10-13 12:37:04 -0700 | 
|---|---|---|
| committer | Rob Pike <r@golang.org> | 2009-10-13 12:37:04 -0700 | 
| commit | 979679431cda09007bb41972386e44dcd25950b9 (patch) | |
| tree | a8dbc89606942f181c2c02f8bf1260f181735a92 /doc/progs/file.go | |
| parent | 1486895b6271c979e59796e317625dbdd9d04974 (diff) | |
| download | golang-979679431cda09007bb41972386e44dcd25950b9.tar.gz | |
Automated g4 rollback of changelist 35383.
*** Reason for rollback ***
roll back the changes to the tutorial programs (only) since they
break the automated processing used to create the tutorial.
*** Original change description ***
apply gofmt to the LGTM-marked files from 34501
that have not changed since I applied gofmt.
R=rsc
DELTA=139  (0 added, 44 deleted, 95 changed)
OCL=35670
CL=35670
Diffstat (limited to 'doc/progs/file.go')
| -rw-r--r-- | doc/progs/file.go | 32 | 
1 files changed, 16 insertions, 16 deletions
| diff --git a/doc/progs/file.go b/doc/progs/file.go index 74b9ee440..bda3890de 100644 --- a/doc/progs/file.go +++ b/doc/progs/file.go @@ -10,21 +10,21 @@ import (  )  type File struct { -	fd	int;	// file descriptor number -	name	string;	// file name at Open time +	fd      int;  // file descriptor number +	name    string; // file name at Open time  }  func newFile(fd int, name string) *File {  	if fd < 0 { -		return nil; +		return nil  	} -	return &File{fd, name}; +	return &File{fd, name}  }  var ( -	Stdin	= newFile(0, "/dev/stdin"); -	Stdout	= newFile(1, "/dev/stdout"); -	Stderr	= newFile(2, "/dev/stderr"); +	Stdin  = newFile(0, "/dev/stdin"); +	Stdout = newFile(1, "/dev/stdout"); +	Stderr = newFile(2, "/dev/stderr");  )  func Open(name string, mode int, perm int) (file *File, err os.Error) { @@ -32,43 +32,43 @@ func Open(name string, mode int, perm int) (file *File, err os.Error) {  	if e != 0 {  		err = os.Errno(e);  	} -	return newFile(r, name), err; +	return newFile(r, name), err  }  func (file *File) Close() os.Error {  	if file == nil { -		return os.EINVAL; +		return os.EINVAL  	}  	e := syscall.Close(file.fd); -	file.fd = -1;	// so it can't be closed again +	file.fd = -1;  // so it can't be closed again  	if e != 0 {  		return os.Errno(e);  	} -	return nil; +	return nil  }  func (file *File) Read(b []byte) (ret int, err os.Error) {  	if file == nil { -		return -1, os.EINVAL; +		return -1, os.EINVAL  	}  	r, e := syscall.Read(file.fd, b);  	if e != 0 {  		err = os.Errno(e);  	} -	return int(r), err; +	return int(r), err  }  func (file *File) Write(b []byte) (ret int, err os.Error) {  	if file == nil { -		return -1, os.EINVAL; +		return -1, os.EINVAL  	}  	r, e := syscall.Write(file.fd, b);  	if e != 0 {  		err = os.Errno(e);  	} -	return int(r), err; +	return int(r), err  }  func (file *File) String() string { -	return file.name; +	return file.name  } | 
