From b5d9767c0a202095ddb65aad00baefe9d42510c9 Mon Sep 17 00:00:00 2001
From: Sean Treadway <sean@soundcloud.com>
Date: Fri, 13 Jun 2014 10:22:04 +0200
Subject: [PATCH] Consistent puncutation, names and constants

  * European sentence punctuation, consistent with package docs
  * Match os.SEEK_* constants instead of numeric constants from io.Seeker
  * Consistent (shorter) receiver name for quickcheck value
---
 client.go                  | 16 +++++-----------
 client_integration_test.go | 26 +++++++++++++-------------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/client.go b/client.go
index 6ea2f21..de814bc 100644
--- a/client.go
+++ b/client.go
@@ -634,21 +634,15 @@ func (f *File) Write(b []byte) (int, error) {
 }
 
 // Seek implements io.Seeker by setting the client offset for the next Read or
-// Write.  It returns the next offset read.  Seeking before of after the end of
-// the file is undefined.  Seeking relative to the end calls Stat.
+// Write. It returns the next offset read. Seeking before or after the end of
+// the file is undefined. Seeking relative to the end calls Stat.
 func (f *File) Seek(offset int64, whence int) (int64, error) {
-	const (
-		SET = 0
-		CUR = 1
-		END = 2
-	)
-
 	switch whence {
-	case SET:
+	case os.SEEK_SET:
 		f.offset = uint64(offset)
-	case CUR:
+	case os.SEEK_CUR:
 		f.offset = uint64(int64(f.offset) + offset)
-	case END:
+	case os.SEEK_END:
 		fi, err := f.Stat()
 		if err != nil {
 			return int64(f.offset), err
diff --git a/client_integration_test.go b/client_integration_test.go
index 3fed30c..87ca1d7 100644
--- a/client_integration_test.go
+++ b/client_integration_test.go
@@ -149,31 +149,31 @@ func (s seek) Generate(r *rand.Rand, _ int) reflect.Value {
 	return reflect.ValueOf(s)
 }
 
-func (cfg seek) set(t *testing.T, r io.ReadSeeker) {
-	if _, err := r.Seek(cfg.offset, 0); err != nil {
-		t.Fatalf("error while seeking with %+v: %v", cfg, err)
+func (s seek) set(t *testing.T, r io.ReadSeeker) {
+	if _, err := r.Seek(s.offset, os.SEEK_SET); err != nil {
+		t.Fatalf("error while seeking with %+v: %v", s, err)
 	}
 }
 
-func (cfg seek) current(t *testing.T, r io.ReadSeeker) {
+func (s seek) current(t *testing.T, r io.ReadSeeker) {
 	const mid = seekBytes / 2
 
-	skip := cfg.offset / 2
-	if cfg.offset > mid {
+	skip := s.offset / 2
+	if s.offset > mid {
 		skip = -skip
 	}
 
-	if _, err := r.Seek(mid, 0); err != nil {
-		t.Fatalf("error seeking to midpoint with %+v: %v", cfg, err)
+	if _, err := r.Seek(mid, os.SEEK_SET); err != nil {
+		t.Fatalf("error seeking to midpoint with %+v: %v", s, err)
 	}
-	if _, err := r.Seek(skip, 1); err != nil {
-		t.Fatalf("error seeking from %d with %+v: %v", mid, cfg, err)
+	if _, err := r.Seek(skip, os.SEEK_CUR); err != nil {
+		t.Fatalf("error seeking from %d with %+v: %v", mid, s, err)
 	}
 }
 
-func (cfg seek) end(t *testing.T, r io.ReadSeeker) {
-	if _, err := r.Seek(-cfg.offset, 2); err != nil {
-		t.Fatalf("error seeking from end with %+v: %v", cfg, err)
+func (s seek) end(t *testing.T, r io.ReadSeeker) {
+	if _, err := r.Seek(-s.offset, os.SEEK_END); err != nil {
+		t.Fatalf("error seeking from end with %+v: %v", s, err)
 	}
 }