use canonical variable names

1 files changed, 11 insertions, 11 deletions

diff --git a/skate/zipkey/zipkey.go b/skate/zipkey/zipkey.go
index 3805535..3e8a133 100644
--- a/skate/zipkey/zipkey.go
+++ b/skate/zipkey/zipkey.go
@@ -45,16 +45,16 @@ func New(r0, r1 io.Reader, kf keyFunc, gf groupFunc) *ZipRun {
 
 // Run starts reading from both readers. The process stops, if one reader is
 // exhausted or reads from any reader fail.
-func (c *ZipRun) Run() error {
+func (z *ZipRun) Run() error {
 	var (
 		k0, k1, c0, c1 string // key: k0, k1; current line: c0, c1
 		done           bool
 		err            error
 		lineKey        = func(r *bufio.Reader) (line, key string, err error) {
-			if line, err = r.ReadString(c.sep); err != nil {
+			if line, err = r.ReadString(z.sep); err != nil {
 				return
 			}
-			key, err = c.kf(line)
+			key, err = z.kf(line)
 			return
 		}
 	)
@@ -65,7 +65,7 @@ func (c *ZipRun) Run() error {
 		switch {
 		case k0 == "" || k0 < k1:
 			for k0 == "" || k0 < k1 {
-				c0, k0, err = lineKey(c.r0)
+				c0, k0, err = lineKey(z.r0)
 				if err == io.EOF {
 					return nil
 				}
@@ -75,7 +75,7 @@ func (c *ZipRun) Run() error {
 			}
 		case k1 == "" || k0 > k1:
 			for k1 == "" || k0 > k1 {
-				c1, k1, err = lineKey(c.r1)
+				c1, k1, err = lineKey(z.r1)
 				if err == io.EOF {
 					return nil
 				}
@@ -90,7 +90,7 @@ func (c *ZipRun) Run() error {
 				G1:  []string{c1},
 			}
 			for {
-				c0, err = c.r0.ReadString(c.sep)
+				c0, err = z.r0.ReadString(z.sep)
 				if err == io.EOF {
 					done = true
 					break
@@ -98,7 +98,7 @@ func (c *ZipRun) Run() error {
 				if err != nil {
 					return err
 				}
-				k, err := c.kf(c0)
+				k, err := z.kf(c0)
 				if err != nil {
 					return err
 				}
@@ -111,7 +111,7 @@ func (c *ZipRun) Run() error {
 				}
 			}
 			for {
-				c1, err = c.r1.ReadString(c.sep)
+				c1, err = z.r1.ReadString(z.sep)
 				if err == io.EOF {
 					done = true
 					break
@@ -119,7 +119,7 @@ func (c *ZipRun) Run() error {
 				if err != nil {
 					return err
 				}
-				k, err := c.kf(c1)
+				k, err := z.kf(c1)
 				if err != nil {
 					return err
 				}
@@ -131,8 +131,8 @@ func (c *ZipRun) Run() error {
 					break
 				}
 			}
-			if c.gf != nil {
-				if err := c.gf(g); err != nil {
+			if z.gf != nil {
+				if err := z.gf(g); err != nil {
 					return err
 				}
 			}