Skip to content

Commit

Permalink
public errors
Browse files Browse the repository at this point in the history
  • Loading branch information
ihateradiohead committed Dec 29, 2024
1 parent 630d98c commit 4d018b3
Show file tree
Hide file tree
Showing 11 changed files with 66 additions and 66 deletions.
24 changes: 12 additions & 12 deletions internal/aes7z/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
)

var (
errAlreadyClosed = errors.New("aes7z: already closed")
errNeedOneReader = errors.New("aes7z: need exactly one reader")
errInsufficientProperties = errors.New("aes7z: not enough properties")
errNoPasswordSet = errors.New("aes7z: no password set")
errUnsupportedMethod = errors.New("aes7z: unsupported compression method")
ErrAlreadyClosed = errors.New("aes7z: already closed")
ErrNeedOneReader = errors.New("aes7z: need exactly one reader")
ErrInsufficientProperties = errors.New("aes7z: not enough properties")
ErrNoPasswordSet = errors.New("aes7z: no password set")
ErrUnsupportedMethod = errors.New("aes7z: unsupported compression method")
)

type readCloser struct {
Expand All @@ -28,7 +28,7 @@ type readCloser struct {

func (rc *readCloser) Close() error {
if rc.rc == nil {
return errAlreadyClosed
return ErrAlreadyClosed
}

if err := rc.rc.Close(); err != nil {
Expand Down Expand Up @@ -58,11 +58,11 @@ func (rc *readCloser) Password(p string) error {

func (rc *readCloser) Read(p []byte) (int, error) {
if rc.rc == nil {
return 0, errAlreadyClosed
return 0, ErrAlreadyClosed
}

if rc.cbc == nil {
return 0, errNoPasswordSet
return 0, ErrNoPasswordSet
}

var block [aes.BlockSize]byte
Expand Down Expand Up @@ -94,16 +94,16 @@ func (rc *readCloser) Read(p []byte) (int, error) {
// cipher is correctly initialised.
func NewReader(p []byte, _ uint64, readers []io.ReadCloser) (io.ReadCloser, error) {
if len(readers) != 1 {
return nil, errNeedOneReader
return nil, ErrNeedOneReader
}

// Need at least two bytes initially
if len(p) < 2 {
return nil, errInsufficientProperties
return nil, ErrInsufficientProperties
}

if p[0]&0xc0 == 0 {
return nil, errUnsupportedMethod
return nil, ErrUnsupportedMethod
}

rc := new(readCloser)
Expand All @@ -112,7 +112,7 @@ func NewReader(p []byte, _ uint64, readers []io.ReadCloser) (io.ReadCloser, erro
iv := p[0]>>6&1 + p[1]&0x0f

if len(p) != int(2+salt+iv) {
return nil, errInsufficientProperties
return nil, ErrInsufficientProperties
}

rc.salt = p[2 : 2+salt]
Expand Down
10 changes: 5 additions & 5 deletions internal/bcj2/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ const (
)

var (
errAlreadyClosed = errors.New("bcj2: already closed")
errNeedFourReaders = errors.New("bcj2: need exactly four readers")
ErrAlreadyClosed = errors.New("bcj2: already closed")
ErrNeedFourReaders = errors.New("bcj2: need exactly four readers")
)

func isJcc(b0, b1 byte) bool {
Expand All @@ -63,7 +63,7 @@ func index(b0, b1 byte) int {
// NewReader returns a new BCJ2 io.ReadCloser.
func NewReader(_ []byte, _ uint64, readers []io.ReadCloser) (io.ReadCloser, error) {
if len(readers) != 4 {
return nil, errNeedFourReaders
return nil, ErrNeedFourReaders
}

rc := &readCloser{
Expand Down Expand Up @@ -98,7 +98,7 @@ func NewReader(_ []byte, _ uint64, readers []io.ReadCloser) (io.ReadCloser, erro

func (rc *readCloser) Close() error {
if rc.main == nil || rc.call == nil || rc.jump == nil || rc.rd == nil {
return errAlreadyClosed
return ErrAlreadyClosed
}

if err := errors.Join(rc.main.Close(), rc.call.Close(), rc.jump.Close(), rc.rd.Close()); err != nil {
Expand All @@ -112,7 +112,7 @@ func (rc *readCloser) Close() error {

func (rc *readCloser) Read(p []byte) (int, error) {
if rc.main == nil || rc.call == nil || rc.jump == nil || rc.rd == nil {
return 0, errAlreadyClosed
return 0, ErrAlreadyClosed
}

if err := rc.read(); err != nil && !errors.Is(err, io.EOF) {
Expand Down
10 changes: 5 additions & 5 deletions internal/bra/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ type readCloser struct {
}

var (
errAlreadyClosed = errors.New("bra: already closed")
errNeedOneReader = errors.New("bra: need exactly one reader")
ErrAlreadyClosed = errors.New("bra: already closed")
ErrNeedOneReader = errors.New("bra: need exactly one reader")
)

func (rc *readCloser) Close() error {
if rc.rc == nil {
return errAlreadyClosed
return ErrAlreadyClosed
}

if err := rc.rc.Close(); err != nil {
Expand All @@ -35,7 +35,7 @@ func (rc *readCloser) Close() error {

func (rc *readCloser) Read(p []byte) (int, error) {
if rc.rc == nil {
return 0, errAlreadyClosed
return 0, ErrAlreadyClosed
}

if _, err := io.CopyN(&rc.buf, rc.rc, int64(max(len(p), rc.conv.Size())-rc.buf.Len())); err != nil {
Expand All @@ -62,7 +62,7 @@ func (rc *readCloser) Read(p []byte) (int, error) {

func newReader(readers []io.ReadCloser, conv converter) (io.ReadCloser, error) {
if len(readers) != 1 {
return nil, errNeedOneReader
return nil, ErrNeedOneReader
}

return &readCloser{
Expand Down
10 changes: 5 additions & 5 deletions internal/brotli/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ var (
//nolint:gochecknoglobals
brotliReaderPool sync.Pool

errAlreadyClosed = errors.New("brotli: already closed")
errNeedOneReader = errors.New("brotli: need exactly one reader")
ErrAlreadyClosed = errors.New("brotli: already closed")
ErrNeedOneReader = errors.New("brotli: need exactly one reader")
)

// This isn't part of the Brotli format but is prepended by the 7-zip implementation.
Expand All @@ -43,7 +43,7 @@ type headerFrame struct {

func (rc *readCloser) Close() error {
if rc.c == nil || rc.r == nil {
return errAlreadyClosed
return ErrAlreadyClosed
}

if err := rc.c.Close(); err != nil {
Expand All @@ -58,7 +58,7 @@ func (rc *readCloser) Close() error {

func (rc *readCloser) Read(p []byte) (int, error) {
if rc.r == nil {
return 0, errAlreadyClosed
return 0, ErrAlreadyClosed
}

n, err := rc.r.Read(p)
Expand All @@ -72,7 +72,7 @@ func (rc *readCloser) Read(p []byte) (int, error) {
// NewReader returns a new Brotli io.ReadCloser.
func NewReader(_ []byte, _ uint64, readers []io.ReadCloser) (io.ReadCloser, error) {
if len(readers) != 1 {
return nil, errNeedOneReader
return nil, ErrNeedOneReader
}

hr, b := new(headerFrame), new(bytes.Buffer)
Expand Down
10 changes: 5 additions & 5 deletions internal/bzip2/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ type readCloser struct {
}

var (
errAlreadyClosed = errors.New("bzip2: already closed")
errNeedOneReader = errors.New("bzip2: need exactly one reader")
ErrAlreadyClosed = errors.New("bzip2: already closed")
ErrNeedOneReader = errors.New("bzip2: need exactly one reader")
)

func (rc *readCloser) Close() error {
if rc.c == nil || rc.r == nil {
return errAlreadyClosed
return ErrAlreadyClosed
}

if err := rc.c.Close(); err != nil {
Expand All @@ -34,7 +34,7 @@ func (rc *readCloser) Close() error {

func (rc *readCloser) Read(p []byte) (int, error) {
if rc.r == nil {
return 0, errAlreadyClosed
return 0, ErrAlreadyClosed
}

n, err := rc.r.Read(p)
Expand All @@ -48,7 +48,7 @@ func (rc *readCloser) Read(p []byte) (int, error) {
// NewReader returns a new bzip2 io.ReadCloser.
func NewReader(_ []byte, _ uint64, readers []io.ReadCloser) (io.ReadCloser, error) {
if len(readers) != 1 {
return nil, errNeedOneReader
return nil, ErrNeedOneReader
}

return &readCloser{
Expand Down
10 changes: 5 additions & 5 deletions internal/deflate/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ var (
//nolint:gochecknoglobals
flateReaderPool sync.Pool

errAlreadyClosed = errors.New("deflate: already closed")
errNeedOneReader = errors.New("deflate: need exactly one reader")
ErrAlreadyClosed = errors.New("deflate: already closed")
ErrNeedOneReader = errors.New("deflate: need exactly one reader")
)

func (rc *readCloser) Close() error {
if rc.c == nil || rc.fr == nil {
return errAlreadyClosed
return ErrAlreadyClosed
}

if err := errors.Join(rc.fr.Close(), rc.c.Close()); err != nil {
Expand All @@ -41,7 +41,7 @@ func (rc *readCloser) Close() error {

func (rc *readCloser) Read(p []byte) (int, error) {
if rc.c == nil || rc.fr == nil {
return 0, errAlreadyClosed
return 0, ErrAlreadyClosed
}

n, err := rc.fr.Read(p)
Expand All @@ -55,7 +55,7 @@ func (rc *readCloser) Read(p []byte) (int, error) {
// NewReader returns a new DEFLATE io.ReadCloser.
func NewReader(_ []byte, _ uint64, readers []io.ReadCloser) (io.ReadCloser, error) {
if len(readers) != 1 {
return nil, errNeedOneReader
return nil, ErrNeedOneReader
}

fr, ok := flateReaderPool.Get().(io.ReadCloser)
Expand Down
14 changes: 7 additions & 7 deletions internal/delta/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ const (
)

var (
errAlreadyClosed = errors.New("delta: already closed")
errNeedOneReader = errors.New("delta: need exactly one reader")
errInsufficientProperties = errors.New("delta: not enough properties")
ErrAlreadyClosed = errors.New("delta: already closed")
ErrNeedOneReader = errors.New("delta: need exactly one reader")
ErrInsufficientProperties = errors.New("delta: not enough properties")
)

func (rc *readCloser) Close() error {
if rc.rc == nil {
return errAlreadyClosed
return ErrAlreadyClosed
}

if err := rc.rc.Close(); err != nil {
Expand All @@ -39,7 +39,7 @@ func (rc *readCloser) Close() error {

func (rc *readCloser) Read(p []byte) (int, error) {
if rc.rc == nil {
return 0, errAlreadyClosed
return 0, ErrAlreadyClosed
}

n, err := rc.rc.Read(p)
Expand Down Expand Up @@ -75,11 +75,11 @@ func (rc *readCloser) Read(p []byte) (int, error) {
// NewReader returns a new Delta io.ReadCloser.
func NewReader(p []byte, _ uint64, readers []io.ReadCloser) (io.ReadCloser, error) {
if len(readers) != 1 {
return nil, errNeedOneReader
return nil, ErrNeedOneReader
}

if len(p) != 1 {
return nil, errInsufficientProperties
return nil, ErrInsufficientProperties
}

return &readCloser{
Expand Down
10 changes: 5 additions & 5 deletions internal/lz4/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ var (
//nolint:gochecknoglobals
lz4ReaderPool sync.Pool

errAlreadyClosed = errors.New("lz4: already closed")
errNeedOneReader = errors.New("lz4: need exactly one reader")
ErrAlreadyClosed = errors.New("lz4: already closed")
ErrNeedOneReader = errors.New("lz4: need exactly one reader")
)

func (rc *readCloser) Close() error {
if rc.c == nil || rc.r == nil {
return errAlreadyClosed
return ErrAlreadyClosed
}

if err := rc.c.Close(); err != nil {
Expand All @@ -40,7 +40,7 @@ func (rc *readCloser) Close() error {

func (rc *readCloser) Read(p []byte) (int, error) {
if rc.r == nil {
return 0, errAlreadyClosed
return 0, ErrAlreadyClosed
}

n, err := rc.r.Read(p)
Expand All @@ -54,7 +54,7 @@ func (rc *readCloser) Read(p []byte) (int, error) {
// NewReader returns a new LZ4 io.ReadCloser.
func NewReader(_ []byte, _ uint64, readers []io.ReadCloser) (io.ReadCloser, error) {
if len(readers) != 1 {
return nil, errNeedOneReader
return nil, ErrNeedOneReader
}

r, ok := lz4ReaderPool.Get().(*lz4.Reader)
Expand Down
10 changes: 5 additions & 5 deletions internal/lzma/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ type readCloser struct {
}

var (
errAlreadyClosed = errors.New("lzma: already closed")
errNeedOneReader = errors.New("lzma: need exactly one reader")
ErrAlreadyClosed = errors.New("lzma: already closed")
ErrNeedOneReader = errors.New("lzma: need exactly one reader")
)

func (rc *readCloser) Close() error {
if rc.c == nil || rc.r == nil {
return errAlreadyClosed
return ErrAlreadyClosed
}

if err := rc.c.Close(); err != nil {
Expand All @@ -37,7 +37,7 @@ func (rc *readCloser) Close() error {

func (rc *readCloser) Read(p []byte) (int, error) {
if rc.r == nil {
return 0, errAlreadyClosed
return 0, ErrAlreadyClosed
}

n, err := rc.r.Read(p)
Expand All @@ -51,7 +51,7 @@ func (rc *readCloser) Read(p []byte) (int, error) {
// NewReader returns a new LZMA io.ReadCloser.
func NewReader(p []byte, s uint64, readers []io.ReadCloser) (io.ReadCloser, error) {
if len(readers) != 1 {
return nil, errNeedOneReader
return nil, ErrNeedOneReader
}

h := bytes.NewBuffer(p)
Expand Down
Loading

0 comments on commit 4d018b3

Please sign in to comment.