Skip to content

Commit a4ef56f

Browse files
authored
Merge pull request #3 from ldez/fix/error-message
fix: error message.
2 parents 565402c + 48671c5 commit a4ef56f

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ _testmain.go
2222
*.exe
2323
*.test
2424
*.prof
25+
26+
vendor/

buffer.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// package multibuf implements buffer optimized for streaming large chunks of data,
1+
// Package multibuf implements buffer optimized for streaming large chunks of data,
22
// multiple reads and optional partial buffering to disk.
33
package multibuf
44

@@ -157,9 +157,10 @@ type MaxSizeReachedError struct {
157157
}
158158

159159
func (e *MaxSizeReachedError) Error() string {
160-
return fmt.Sprintf("Maximum size %d was reached", e)
160+
return fmt.Sprintf("Maximum size %d was reached", e.MaxSize)
161161
}
162162

163+
// Default sizes
163164
const (
164165
DefaultMemBytes = 1048576
165166
DefaultMaxBytes = -1
@@ -298,7 +299,6 @@ const (
298299

299300
type writerOnce struct {
300301
o options
301-
err error
302302
state int
303303
mem *bytes.Buffer
304304
file *os.File
@@ -357,7 +357,7 @@ func (w *writerOnce) write(p []byte) (int, error) {
357357
}
358358
// we can't write to memory any more, switch to file
359359
if err := w.initFile(); err != nil {
360-
return int(writeToMem), err
360+
return writeToMem, err
361361
}
362362
w.state = writerFile
363363
wrote, err := w.file.Write(p[writeToMem:])
@@ -406,7 +406,7 @@ func (w *writerOnce) Reader() (MultiReader, error) {
406406
w.mem = nil
407407
return newBuf(w.total, w.cleanupFn, br, fr), nil
408408
}
409-
return nil, fmt.Errorf("unsupported state: %d\n", w.state)
409+
return nil, fmt.Errorf("unsupported state: %d", w.state)
410410
}
411411

412412
const tempFilePrefix = "temp-multibuf-"

buffer_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ func (s *BufferSuite) TestSeekFirst(c *C) {
9999
tlen := int64(1057576)
100100
r, hash := createReaderOfSize(tlen)
101101
bb, err := New(r)
102+
c.Assert(err, IsNil)
102103

103104
l, err := bb.Size()
104105
c.Assert(err, IsNil)

0 commit comments

Comments
 (0)