summaryrefslogtreecommitdiff
path: root/cryptfs/cryptfs_content.go
diff options
context:
space:
mode:
authorJakob Unterwurzacher2015-10-04 14:24:43 +0200
committerJakob Unterwurzacher2015-10-04 14:24:43 +0200
commitc859f0b2dc8825763c3b63163a014435a8cdb3cf (patch)
tree3dc6f686e00322bfca25a70cb256524d27df81f4 /cryptfs/cryptfs_content.go
parent775676ecb82f415874f3c6b83da1436b629166f4 (diff)
intraBlock: Rename Offset to Skip
"Offset" is unclear whether it is an offset from the start of file or start of block. "Skip" seems much better.
Diffstat (limited to 'cryptfs/cryptfs_content.go')
-rw-r--r--cryptfs/cryptfs_content.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/cryptfs/cryptfs_content.go b/cryptfs/cryptfs_content.go
index ab5ec78..761fef5 100644
--- a/cryptfs/cryptfs_content.go
+++ b/cryptfs/cryptfs_content.go
@@ -112,8 +112,8 @@ func (be *CryptFS) SplitRange(offset uint64, length uint64) []intraBlock {
for length > 0 {
b.BlockNo = offset / be.plainBS
- b.Offset = offset % be.plainBS
- b.Length = be.minu64(length, be.plainBS - b.Offset)
+ b.Skip = offset % be.plainBS
+ b.Length = be.minu64(length, be.plainBS - b.Skip)
parts = append(parts, b)
offset += b.Length
length -= b.Length
@@ -187,7 +187,7 @@ func (be *CryptFS) JoinCiphertextRange(blocks []intraBlock) (uint64, uint64) {
// Crop plaintext that correspons to complete cipher blocks down to what is
// requested according to "iblocks"
func (be *CryptFS) CropPlaintext(plaintext []byte, blocks []intraBlock) []byte {
- offset := blocks[0].Offset
+ offset := blocks[0].Skip
last := blocks[len(blocks)-1]
length := (last.BlockNo - blocks[0].BlockNo + 1) * be.plainBS
var cropped []byte