TrueCloudLab/rclone
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

Remove io.SeekStart and replace with 0 as it is go 1.7 only

Browse source
This commit is contained in:
Nick Craig-Wood 2016-10-22 12:07:51 +01:00
parent 5b8327038a
commit 93e84403bb
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/mount/read.go
View file

@ -44,7 +44,7 @@ func (fh *ReadFileHandle) seek(offset int64) error {
// Can we seek it directly? // Can we seek it directly?
if do, ok := fh.r.(io.Seeker); ok { if do, ok := fh.r.(io.Seeker); ok {
fs.Debug(fh.o, "ReadFileHandle.seek from %d to %d (io.Seeker)", fh.offset, offset) fs.Debug(fh.o, "ReadFileHandle.seek from %d to %d (io.Seeker)", fh.offset, offset)
_, err := do.Seek(offset, io.SeekStart) _, err := do.Seek(offset, 0)
if err != nil { if err != nil {
fs.Debug(fh.o, "ReadFileHandle.Read io.Seeker failed: %v", err) fs.Debug(fh.o, "ReadFileHandle.Read io.Seeker failed: %v", err)
return err return err

6
crypt/cipher.go
View file

@ -542,7 +542,7 @@ func (c *cipher) newDecrypterSeek(open OpenAtOffset, offset int64) (fh *decrypte
} }
fh.open = open // will be called by fh.Seek fh.open = open // will be called by fh.Seek
if offset != 0 { if offset != 0 {
_, err = fh.Seek(offset, io.SeekStart) _, err = fh.Seek(offset, 0)
if err != nil { if err != nil {
_ = fh.Close() _ = fh.Close()
return nil, err return nil, err
@ -593,7 +593,7 @@ func (fh *decrypter) Seek(offset int64, whence int) (int64, error) {
if fh.open == nil { if fh.open == nil {
return 0, fh.finish(errors.New("can't seek - not initialised with newDecrypterSeek")) return 0, fh.finish(errors.New("can't seek - not initialised with newDecrypterSeek"))
} }
if whence != io.SeekStart { if whence != 0 {
return 0, fh.finish(errors.New("can only seek from the start")) return 0, fh.finish(errors.New("can only seek from the start"))
} }
@ -606,7 +606,7 @@ func (fh *decrypter) Seek(offset int64, whence int) (int64, error) {
// Can we seek it directly? // Can we seek it directly?
if do, ok := fh.rc.(io.Seeker); ok { if do, ok := fh.rc.(io.Seeker); ok {
_, err := do.Seek(offset, io.SeekStart) _, err := do.Seek(offset, 0)
if err != nil { if err != nil {
return 0, fh.finish(err) return 0, fh.finish(err)
} }

2
crypt/cipher_test.go
View file

@ -895,7 +895,7 @@ func TestNewDecrypterSeek(t *testing.T) {
// Now try decoding it with a single open and lots of seeks // Now try decoding it with a single open and lots of seeks
rc, err := c.DecryptDataSeek(open, 0) rc, err := c.DecryptDataSeek(open, 0)
for _, offset := range trials { for _, offset := range trials {
_, err := rc.Seek(int64(offset), io.SeekStart) _, err := rc.Seek(int64(offset), 0)
assert.NoError(t, err) assert.NoError(t, err)
seekedDecrypted, err := ioutil.ReadAll(rc) seekedDecrypted, err := ioutil.ReadAll(rc)