From 778b870b77a8180a61c4bae96550539f1708eadf Mon Sep 17 00:00:00 2001 From: karthic rao Date: Sat, 9 Jul 2016 05:52:55 +0530 Subject: [PATCH] placing the http range error in objct-api-errors. (#2150) --- httprange.go | 15 --------------- object-errors.go | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/httprange.go b/httprange.go index 45ef90814..71103ed2f 100644 --- a/httprange.go +++ b/httprange.go @@ -17,7 +17,6 @@ package main import ( - "errors" "fmt" "regexp" "strconv" @@ -28,20 +27,6 @@ const ( byteRangePrefix = "bytes=" ) -// errInvalidRange - returned when given range value is not valid. -var errInvalidRange = errors.New("Invalid range") - -// InvalidRange - invalid range typed error. -type InvalidRange struct { - offsetBegin int64 - offsetEnd int64 - resourceSize int64 -} - -func (e InvalidRange) Error() string { - return fmt.Sprintf("The requested range \"bytes %d-%d/%d\" is not satisfiable.", e.offsetBegin, e.offsetEnd, e.resourceSize) -} - // Valid byte position regexp var validBytePos = regexp.MustCompile(`^[0-9]+$`) diff --git a/object-errors.go b/object-errors.go index 33e0c81d0..6611f909f 100644 --- a/object-errors.go +++ b/object-errors.go @@ -17,6 +17,7 @@ package main import ( + "errors" "fmt" "io" ) @@ -205,6 +206,20 @@ func (e IncompleteBody) Error() string { return e.Bucket + "#" + e.Object + "has incomplete body" } +// errInvalidRange - returned when given range value is not valid. +var errInvalidRange = errors.New("Invalid range") + +// InvalidRange - invalid range typed error. +type InvalidRange struct { + offsetBegin int64 + offsetEnd int64 + resourceSize int64 +} + +func (e InvalidRange) Error() string { + return fmt.Sprintf("The requested range \"bytes %d-%d/%d\" is not satisfiable.", e.offsetBegin, e.offsetEnd, e.resourceSize) +} + /// Multipart related errors. // MalformedUploadID malformed upload id.