alexvanin/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

replace "too small" with "too short" in error messages

Browse source
This commit is contained in:
Michael Eischer 2024-05-11 21:36:16 +02:00
parent 53561474d9
commit 6328b7e1f5
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/cache/file.go vendored
View file

@ -61,7 +61,7 @@ func (c *Cache) load(h backend.Handle, length int, offset int64) (io.ReadCloser,
if size < offset+int64(length) { if size < offset+int64(length) {
_ = f.Close() _ = f.Close()
_ = c.remove(h) _ = c.remove(h)
return nil, errors.Errorf("cached file %v is too small, removing", h) return nil, errors.Errorf("cached file %v is too short, removing", h)
} }
if offset > 0 { if offset > 0 {

2
internal/crypto/crypto.go
View file

@ -299,7 +299,7 @@ func (k *Key) Open(dst, nonce, ciphertext, _ []byte) ([]byte, error) {
// check for plausible length // check for plausible length
if len(ciphertext) < k.Overhead() { if len(ciphertext) < k.Overhead() {
return nil, errors.Errorf("trying to decrypt invalid data: ciphertext too small") return nil, errors.Errorf("trying to decrypt invalid data: ciphertext too short")
} }
l := len(ciphertext) - macSize l := len(ciphertext) - macSize

2
internal/index/indexmap.go
View file

@ -204,7 +204,7 @@ func (h *hashedArrayTree) Size() uint {
func (h *hashedArrayTree) grow() { func (h *hashedArrayTree) grow() {
idx, subIdx := h.index(h.size) idx, subIdx := h.index(h.size)
if int(idx) == len(h.blockList) { if int(idx) == len(h.blockList) {
// blockList is too small -> double list and block size // blockList is too short -> double list and block size
h.blockSize *= 2 h.blockSize *= 2
h.mask = h.mask*2 + 1 h.mask = h.mask*2 + 1
h.maskShift++ h.maskShift++

6
internal/pack/pack.go
View file

@ -239,7 +239,7 @@ func readRecords(rd io.ReaderAt, size int64, bufsize int) ([]byte, int, error) {
case hlen == 0: case hlen == 0:
err = InvalidFileError{Message: "header length is zero"} err = InvalidFileError{Message: "header length is zero"}
case hlen < crypto.Extension: case hlen < crypto.Extension:
err = InvalidFileError{Message: "header length is too small"} err = InvalidFileError{Message: "header length is too short"}
case int64(hlen) > size-int64(headerLengthSize): case int64(hlen) > size-int64(headerLengthSize):
err = InvalidFileError{Message: "header is larger than file"} err = InvalidFileError{Message: "header is larger than file"}
case int64(hlen) > MaxHeaderSize-int64(headerLengthSize): case int64(hlen) > MaxHeaderSize-int64(headerLengthSize):
@ -263,7 +263,7 @@ func readRecords(rd io.ReaderAt, size int64, bufsize int) ([]byte, int, error) {
func readHeader(rd io.ReaderAt, size int64) ([]byte, error) { func readHeader(rd io.ReaderAt, size int64) ([]byte, error) {
debug.Log("size: %v", size) debug.Log("size: %v", size)
if size < int64(minFileSize) { if size < int64(minFileSize) {
err := InvalidFileError{Message: "file is too small"} err := InvalidFileError{Message: "file is too short"}
return nil, errors.Wrap(err, "readHeader") return nil, errors.Wrap(err, "readHeader")
} }
@ -305,7 +305,7 @@ func List(k *crypto.Key, rd io.ReaderAt, size int64) (entries []restic.Blob, hdr
} }
if len(buf) < crypto.CiphertextLength(0) { if len(buf) < crypto.CiphertextLength(0) {
return nil, 0, errors.New("invalid header, too small") return nil, 0, errors.New("invalid header, too short")
} }
hdrSize = headerLengthSize + uint32(len(buf)) hdrSize = headerLengthSize + uint32(len(buf))

2
internal/repository/prune.go
View file

@ -444,7 +444,7 @@ func decidePackAction(ctx context.Context, opts PruneOptions, repo restic.Reposi
// This is equivalent to sorting by unused / total space. // This is equivalent to sorting by unused / total space.
// Instead of unused[i] / used[i] > unused[j] / used[j] we use // Instead of unused[i] / used[i] > unused[j] / used[j] we use
// unused[i] * used[j] > unused[j] * used[i] as uint32*uint32 < uint64 // unused[i] * used[j] > unused[j] * used[i] as uint32*uint32 < uint64
// Moreover packs containing trees and too small packs are sorted to the beginning // Moreover packs containing trees and too short packs are sorted to the beginning
sort.Slice(repackCandidates, func(i, j int) bool { sort.Slice(repackCandidates, func(i, j int) bool {
pi := repackCandidates[i].packInfo pi := repackCandidates[i].packInfo
pj := repackCandidates[j].packInfo pj := repackCandidates[j].packInfo