Skip to content

Commit

Permalink
Fix the signature of tag.WriteTo
Browse files Browse the repository at this point in the history
  • Loading branch information
n10v committed Feb 10, 2017
1 parent 917d20f commit 3aabe54
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions tag.go
Original file line number Diff line number Diff line change
Expand Up @@ -286,9 +286,9 @@ func (t *Tag) Save() error {
defer os.Remove(newFile.Name())

// If there is at least one frame, write whole tag in new file
var framesSize int
var framesSize int64
if t.HasAnyFrames() {
tagSize, err := t.Write(newFile)
tagSize, err := t.WriteTo(newFile)
if err != nil {
return err
}
Expand All @@ -307,7 +307,7 @@ func (t *Tag) Save() error {
}

// Set t.originalSize to new frames size
t.originalSize = int64(framesSize)
t.originalSize = framesSize

// Get original file mode
originalFileStat, err := originalFile.Stat()
Expand Down Expand Up @@ -338,10 +338,10 @@ func (t *Tag) Save() error {
return nil
}

// Write writes whole tag in w.
// It returns the number of bytes written and error. It returns nil as error
// if writing was successful.
func (t Tag) Write(w io.Writer) (n int, err error) {
// WriteTo writes whole tag in w.
// It returns the number of bytes written and error during the write.
// It returns nil as error if the write was successful.
func (t Tag) WriteTo(w io.Writer) (n int64, err error) {
// Form size of frames
framesSize := t.Size() - tagHeaderSize
byteFramesSize, err := util.FormSize(framesSize)
Expand All @@ -351,24 +351,24 @@ func (t Tag) Write(w io.Writer) (n int, err error) {

// Write tag header
if _, err = w.Write(formTagHeader(byteFramesSize, t.version)); err != nil {
return n, err
return 0, err
}
n += tagHeaderSize

// Write frames
nn, err := t.writeAllFrames(w)
if err != nil {
return n, err
return 0, err
}
n += nn

return
return n, err
}

// writeAllFrames writes all frames to w and returns
// the number of bytes written and error. It returns nil as error
// if writing was successful.
func (t Tag) writeAllFrames(w io.Writer) (int, error) {
// the number of bytes written and error during the write.
// It returns nil as error if the write was successful.
func (t Tag) writeAllFrames(w io.Writer) (int64, error) {
bw := bwpool.Get(w)
defer bwpool.Put(bw)

Expand All @@ -379,7 +379,7 @@ func (t Tag) writeAllFrames(w io.Writer) (int, error) {
return 0, err
}

return bw.Buffered(), bw.Flush()
return int64(bw.Buffered()), bw.Flush()
}

func writeFrame(bw *bufio.Writer, id string, frame Framer) error {
Expand Down

0 comments on commit 3aabe54

Please sign in to comment.