code review 5320072: snappy: error rename gofix.

snappy: error rename gofix.

[nigeltao, 2011-11-03 22:49:07]

Hello bradfitz@golang.org (cc: golang-dev@googlegroups.com),

I'd like you to review this change to
https://code.google.com/p/snappy-go/

[bradfitz, 2011-11-03 22:53:23]

LGTM, but sad that Camlistore is pinned at r60.3 for App Engine.

Do you plan to finish leveldb before Go 1?  (just curious.  LGTM either way)


On Thu, Nov 3, 2011 at 3:49 PM, <nigeltao@golang.org> wrote:

> Reviewers: bradfitz,
>
> Message:
> Hello bradfitz@golang.org (cc: golang-dev@googlegroups.com),
>
> I'd like you to review this change to
> https://code.google.com/p/**snappy-go/<https://code.google.com/p/snappy-go/>
>
>
> Description:
> snappy: error rename gofix.
>
> Please review this at
http://codereview.appspot.com/**5320072/<http://codereview.appspot.com/5320072/>
>
> Affected files:
>  M snappy/decode.go
>  M snappy/encode.go
>  M snappy/snappy_test.go
>
>
> Index: snappy/decode.go
> ==============================**==============================**=======
> --- a/snappy/decode.go
> +++ b/snappy/decode.go
> @@ -5,29 +5,29 @@
>  package snappy
>
>  import (
> -       "os"
> +       "errors"
>
>       
"snappy-go.googlecode.com/hg/**varint<http://snappy-go.googlecode.com/hg/varint>
> "
>  )
>
>  // ErrCorrupt reports that the input is invalid.
> -var ErrCorrupt = os.NewError("snappy: corrupt input")
> +var ErrCorrupt = errors.New("snappy: corrupt input")
>
>  // DecodedLen returns the length of the decoded block.
> -func DecodedLen(src []byte) (int, os.Error) {
> +func DecodedLen(src []byte) (int, error) {
>        v, _, err := decodedLen(src)
>        return v, err
>  }
>
>  // decodedLen returns the length of the decoded block and the number of
> bytes
>  // that the length header occupied.
> -func decodedLen(src []byte) (blockLen, headerLen int, err os.Error) {
> +func decodedLen(src []byte) (blockLen, headerLen int, err error) {
>        v, n := varint.Decode(src)
>        if n == 0 {
>                return 0, 0, ErrCorrupt
>        }
>        if uint64(int(v)) != v {
> -               return 0, 0, os.NewError("snappy: decoded block is too
> large")
> +               return 0, 0, errors.New("snappy: decoded block is too
> large")
>        }
>        return int(v), n, nil
>  }
> @@ -36,7 +36,7 @@
>  // slice of dst if dst was large enough to hold the entire decoded block.
>  // Otherwise, a newly allocated slice will be returned.
>  // It is valid to pass a nil dst.
> -func Decode(dst, src []byte) ([]byte, os.Error) {
> +func Decode(dst, src []byte) ([]byte, error) {
>        dLen, s, err := decodedLen(src)
>        if err != nil {
>                return nil, err
> @@ -80,7 +80,7 @@
>                        }
>                        length = int(x + 1)
>                        if length <= 0 {
> -                               return nil, os.NewError("snappy:
> unsupported literal length")
> +                               return nil, errors.New("snappy:
> unsupported literal length")
>                        }
>                        if length > len(dst)-d || length > len(src)-s {
>                                return nil, ErrCorrupt
> @@ -107,7 +107,7 @@
>                        offset = int(src[s-2]) | int(src[s-1])<<8
>
>                case tagCopy4:
> -                       return nil, os.NewError("snappy: unsupported
> COPY_4 tag")
> +                       return nil, errors.New("snappy: unsupported COPY_4
> tag")
>                }
>
>                end := d + length
> Index: snappy/encode.go
> ==============================**==============================**=======
> --- a/snappy/encode.go
> +++ b/snappy/encode.go
> @@ -5,8 +5,6 @@
>  package snappy
>
>  import (
> -       "os"
> -
>       
"snappy-go.googlecode.com/hg/**varint<http://snappy-go.googlecode.com/hg/varint>
> "
>  )
>
> @@ -88,7 +86,7 @@
>  // slice of dst if dst was large enough to hold the entire encoded block.
>  // Otherwise, a newly allocated slice will be returned.
>  // It is valid to pass a nil dst.
> -func Encode(dst, src []byte) ([]byte, os.Error) {
> +func Encode(dst, src []byte) ([]byte, error) {
>        if n := MaxEncodedLen(len(src)); len(dst) < n {
>                dst = make([]byte, n)
>        }
> Index: snappy/snappy_test.go
> ==============================**==============================**=======
> --- a/snappy/snappy_test.go
> +++ b/snappy/snappy_test.go
> @@ -8,13 +8,12 @@
>        "bytes"
>        "fmt"
>        "io/ioutil"
> -       "os"
>        "rand"
>        "strings"
>        "testing"
>  )
>
> -func roundtrip(b []byte) os.Error {
> +func roundtrip(b []byte) error {
>        e, err := Encode(nil, b)
>        if err != nil {
>                return fmt.Errorf("encoding error: %v", err)
>
>
>

[nigeltao, 2011-11-03 23:00:12]

On 4 November 2011 09:53, Brad Fitzpatrick <bradfitz@golang.org> wrote:
> Do you plan to finish leveldb before Go 1?  (just curious.  LGTM either way)

I'd like to, but it really depends on whether I can find the time to.

[nigeltao, 2011-11-03 23:01:20]

*** Submitted as e4471433e554 ***

snappy: error rename gofix.

R=bradfitz
CC=golang-dev
http://codereview.appspot.com/5320072