MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #350 from fkautz/pr_out_running_gofmt_manually_auto_gofmt_didn_t_simplify_code

This commit is contained in:
Frederick F. Kautz IV 2015-03-23 12:26:52 -07:00
parent 742a186d10 f91f5e59ee
commit 2191fb739f
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/storage/donut/erasure.go
View File

@ -121,19 +121,19 @@ func erasureGoroutine(r *io.PipeReader, eWriter erasureWriter, isClosed chan<- b
isClosed <- true
}
func (d erasureWriter) Write(data []byte) (int, error) {
io.Copy(d.erasureWriter, bytes.NewBuffer(data))
func (eWriter erasureWriter) Write(data []byte) (int, error) {
io.Copy(eWriter.erasureWriter, bytes.NewBuffer(data))
return len(data), nil
}
func (d erasureWriter) Close() error {
d.erasureWriter.Close()
<-d.isClosed
func (eWriter erasureWriter) Close() error {
eWriter.erasureWriter.Close()
<-eWriter.isClosed
return nil
}
func (d erasureWriter) CloseWithError(err error) error {
for _, writer := range d.writers {
func (eWriter erasureWriter) CloseWithError(err error) error {
for _, writer := range eWriter.writers {
if writer != nil {
writer.CloseWithError(err)
}
@ -141,24 +141,24 @@ func (d erasureWriter) CloseWithError(err error) error {
return nil
}
func (d erasureWriter) SetMetadata(metadata map[string]string) error {
for k, _ := range metadata {
func (eWriter erasureWriter) SetMetadata(metadata map[string]string) error {
for k := range metadata {
if strings.HasPrefix(k, "sys.") {
return errors.New("Invalid key '" + k + "', cannot start with sys.'")
}
}
for k := range d.metadata {
delete(d.metadata, k)
for k := range eWriter.metadata {
delete(eWriter.metadata, k)
}
for k, v := range metadata {
d.metadata[k] = v
eWriter.metadata[k] = v
}
return nil
}
func (d erasureWriter) GetMetadata() (map[string]string, error) {
func (eWriter erasureWriter) GetMetadata() (map[string]string, error) {
metadata := make(map[string]string)
for k, v := range d.metadata {
for k, v := range eWriter.metadata {
metadata[k] = v
}
return metadata, nil