aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-07-26 04:03:09 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-07-26 04:03:09 +0200
commitbed40dec41ca103af59335f050fd0be9b611c34f (patch)
tree3d01fcab1dafaf53acd1dc64774f418381dd55a1
parentb7e8dc4311ce2f819e46c8b377c81f19018eddf4 (diff)
cleanup
-rw-r--r--zsig/zsig.go17
1 files changed, 8 insertions, 9 deletions
diff --git a/zsig/zsig.go b/zsig/zsig.go
index 2eadb96..e726f04 100644
--- a/zsig/zsig.go
+++ b/zsig/zsig.go
@@ -34,7 +34,7 @@ type Reader struct {
Name string
OS byte
CRC uint16
- h hash.Hash32
+ crc hash.Hash32
}
func noEOF(err error) error {
@@ -67,18 +67,18 @@ func (z *Reader) readHeader() error {
z.ModTime = time.Unix(int64(t), 0)
}
z.OS = buf[9]
- z.h = crc32.NewIEEE()
- z.h.Write(buf[:10]) // init CRC
+ z.crc = crc32.NewIEEE()
+ z.crc.Write(buf[:10]) // init CRC
if flg&flagExtra != 0 {
if _, err := io.ReadFull(z, buf[:2]); err != nil {
return noEOF(err)
}
- z.h.Write(buf[:2]) // update CRC
+ z.crc.Write(buf[:2]) // update CRC
data := make([]byte, le.Uint16(buf[:2]))
if _, err := io.ReadFull(z, data); err != nil {
return noEOF(err)
}
- z.h.Write(data) // update CRC
+ z.crc.Write(data) // update CRC
z.Extra = data
}
if flg&flagName != 0 {
@@ -99,9 +99,8 @@ func (z *Reader) readHeader() error {
if _, err := io.ReadFull(z, buf[:2]); err != nil {
return noEOF(err)
}
- z.CRC = le.Uint16(buf[:2])
- crc := uint16(z.h.Sum32())
- if z.CRC != crc {
+ z.CRC = uint16(z.crc.Sum32())
+ if z.CRC != le.Uint16(buf[:2]) {
return ErrHeader
}
}
@@ -113,7 +112,7 @@ func (z *Reader) readString() (string, error) {
if err != nil {
return "", err
}
- io.WriteString(z.h, s) // update CRC
+ io.WriteString(z.crc, s) // update CRC
if l := len(s); l > 0 && s[l-1] == 0 {
s = s[:l-1] // strip last zero
}