From c859f0b2dc8825763c3b63163a014435a8cdb3cf Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sun, 4 Oct 2015 14:24:43 +0200
Subject: 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.
---
 cryptfs/cryptfs_content.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cryptfs/cryptfs_content.go')

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
-- 
cgit v1.2.3