From cf62eb3e15f34899771ca8867ea5f32b673f6711 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Sat, 2 May 2015 16:19:16 +0200
Subject: [PATCH] chunker: unexport WindowSize and AverageBits

---
 chunker/chunker.go | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/chunker/chunker.go b/chunker/chunker.go
index eb92a50c7..a319c71f8 100644
--- a/chunker/chunker.go
+++ b/chunker/chunker.go
@@ -12,16 +12,16 @@ const (
 	MiB = 1024 * KiB
 
 	// WindowSize is the size of the sliding window.
-	WindowSize = 64
+	windowSize = 64
 
 	// aim to create chunks of 20 bits or about 1MiB on average.
-	AverageBits = 20
+	averageBits = 20
 
 	// Chunks should be in the range of 512KiB to 8MiB.
 	MinSize = 512 * KiB
 	MaxSize = 8 * MiB
 
-	splitmask = (1 << AverageBits) - 1
+	splitmask = (1 << averageBits) - 1
 )
 
 type tables struct {
@@ -61,7 +61,7 @@ type Chunker struct {
 	rd     io.Reader
 	closed bool
 
-	window [WindowSize]byte
+	window [windowSize]byte
 	wpos   int
 
 	buf  []byte
@@ -97,7 +97,7 @@ func (c *Chunker) Reset(rd io.Reader, p Pol) {
 	c.fillTables()
 	c.rd = rd
 
-	for i := 0; i < WindowSize; i++ {
+	for i := 0; i < windowSize; i++ {
 		c.window[i] = 0
 	}
 	c.closed = false
@@ -116,7 +116,7 @@ func (c *Chunker) Reset(rd io.Reader, p Pol) {
 	}
 
 	// do not start a new chunk unless at least MinSize bytes have been read
-	c.pre = MinSize - WindowSize
+	c.pre = MinSize - windowSize
 }
 
 // Calculate out_table and mod_table for optimization. Must be called only
@@ -154,7 +154,7 @@ func (c *Chunker) fillTables() {
 		var h Pol
 
 		h = appendByte(h, byte(b), c.pol)
-		for i := 0; i < WindowSize-1; i++ {
+		for i := 0; i < windowSize-1; i++ {
 			h = appendByte(h, 0, c.pol)
 		}
 		c.tables.out[b] = h
@@ -246,7 +246,7 @@ func (c *Chunker) Next() (*Chunk, error) {
 			out := c.window[c.wpos]
 			c.window[c.wpos] = b
 			c.digest ^= uint64(c.tables.out[out])
-			c.wpos = (c.wpos + 1) % WindowSize
+			c.wpos = (c.wpos + 1) % windowSize
 
 			// c.append(b)
 			index := c.digest >> c.polShift
@@ -284,7 +284,7 @@ func (c *Chunker) Next() (*Chunk, error) {
 				c.Reset(c.rd, c.pol)
 				c.pos = pos
 				c.start = pos
-				c.pre = MinSize - WindowSize
+				c.pre = MinSize - windowSize
 
 				return chunk, nil
 			}
@@ -330,7 +330,7 @@ func (c *Chunker) slide(b byte) {
 	out := c.window[c.wpos]
 	c.window[c.wpos] = b
 	c.digest ^= uint64(c.tables.out[out])
-	c.wpos = (c.wpos + 1) % WindowSize
+	c.wpos = (c.wpos + 1) % windowSize
 
 	c.append(b)
 }