From 8900229579ff244c062ceb875aa528f0c3530049 Mon Sep 17 00:00:00 2001
From: Matt Bell <mappum@gmail.com>
Date: Mon, 17 Nov 2014 03:39:00 -0800
Subject: [PATCH] commands/http: Made MultiFileReader#Read more readable
---
commands/http/multifilereader.go | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/commands/http/multifilereader.go b/commands/http/multifilereader.go
index 7d976c7b9..1e2d47e3b 100644
--- a/commands/http/multifilereader.go
+++ b/commands/http/multifilereader.go
@@ -90,21 +90,16 @@ func (mfr *MultiFileReader) Read(buf []byte) (written int, err error) {
}
}
- var reader io.Reader
-
+ // if the buffer has something in it, read from it
if mfr.buf.Len() > 0 {
- // if the buffer has something in it, read from it
- reader = &mfr.buf
-
- } else if mfr.currentFile != nil {
- // otherwise, read from file data
- reader = mfr.currentFile
+ return mfr.buf.Read(buf)
}
- written, err = reader.Read(buf)
- if err == io.EOF && reader == mfr.currentFile {
+ // otherwise, read from file data
+ written, err = mfr.currentFile.Read(buf)
+ if err == io.EOF {
mfr.currentFile = nil
- return mfr.Read(buf)
+ return written, nil
}
return written, err
}
--
GitLab