[net] webdav: replace os.SEEK_XXX with io.SeekXXX

[Damien Neil (Gerrit)]

Damien Neil submitted this change.

View Change

Approvals: Damien Neil: Looks good to me, approved; Run TryBots Cherry Mui: Looks good to me, but someone else must approve Gopher Robot: TryBots succeeded

webdav: replace os.SEEK_XXX with io.SeekXXX

Change-Id: I304410ad143377d48bd6eafcbf2413dcfc4e70a2
GitHub-Last-Rev: 0136a8a0c9d9af31a6f3f71cafc374f2800b9a4d
GitHub-Pull-Request: golang/net#151
Reviewed-on: https://go-review.googlesource.com/c/net/+/432257
Run-TryBot: Damien Neil <dn...@google.com>
Reviewed-by: Damien Neil <dn...@google.com>
TryBot-Result: Gopher Robot <go...@golang.org>
Reviewed-by: Cherry Mui <cher...@google.com>
---
M webdav/file.go
M webdav/file_test.go
M webdav/prop.go
3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/webdav/file.go b/webdav/file.go
index c48a17e..3cd19ff 100644
--- a/webdav/file.go
+++ b/webdav/file.go
@@ -547,11 +547,11 @@
 	npos := f.pos
 	// TODO: How to handle offsets greater than the size of system int?
 	switch whence {
-	case os.SEEK_SET:
+	case io.SeekStart:
 		npos = int(offset)
-	case os.SEEK_CUR:
+	case io.SeekCurrent:
 		npos += int(offset)
-	case os.SEEK_END:
+	case io.SeekEnd:
 		npos = len(f.n.data) + int(offset)
 	default:
 		npos = -1
diff --git a/webdav/file_test.go b/webdav/file_test.go
index 04b8a45..e875c13 100644
--- a/webdav/file_test.go
+++ b/webdav/file_test.go
@@ -711,11 +711,11 @@
 			default:
 				t.Fatalf("test case #%d %q: invalid seek whence", i, tc)
 			case "set":
-				whence = os.SEEK_SET
+				whence = io.SeekStart
 			case "cur":
-				whence = os.SEEK_CUR
+				whence = io.SeekCurrent
 			case "end":
-				whence = os.SEEK_END
+				whence = io.SeekEnd
 			}
 			offset, err := strconv.Atoi(parts[1])
 			if err != nil {
diff --git a/webdav/prop.go b/webdav/prop.go
index 2c48bc4..aa72c62 100644
--- a/webdav/prop.go
+++ b/webdav/prop.go
@@ -425,7 +425,7 @@
 	}
 	ctype = http.DetectContentType(buf[:n])
 	// Rewind file.
-	_, err = f.Seek(0, os.SEEK_SET)
+	_, err = f.Seek(0, io.SeekStart)
 	return ctype, err
 }
 

To view, visit change 432257. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: net

Gerrit-Branch: master

Gerrit-Change-Id: I304410ad143377d48bd6eafcbf2413dcfc4e70a2

Gerrit-Change-Number: 432257

Gerrit-PatchSet: 2

Gerrit-Owner: Gerrit Bot <letsus...@gmail.com>

Gerrit-Reviewer: Cherry Mui <cher...@google.com>

Gerrit-Reviewer: Damien Neil <dn...@google.com>

Gerrit-Reviewer: Gopher Robot <go...@golang.org>

Gerrit-Reviewer: Ian Lance Taylor <ia...@golang.org>

Gerrit-CC: shuang cui <imc...@gmail.com>

Gerrit-MessageType: merged