From b1c86d6baf9aeefe42afe7e540e234adfeb80c5f Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 9 Apr 2018 09:55:38 -0700 Subject: [PATCH] vendor: upgrade "ugorji/go" to f3cacc17c85ecb7f1b6a9e373ee85d1480919868 Signed-off-by: Gyuho Lee --- Gopkg.lock | 2 +- vendor/github.com/ugorji/go/codec/decode.go | 4 ++++ vendor/github.com/ugorji/go/codec/gen.go | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 3c1eae7b8..989dbf1df 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -225,7 +225,7 @@ [[projects]] name = "github.com/ugorji/go" packages = ["codec"] - revision = "6a0f936d9527cafa42a8acfa0bf2d6cc94bb6024" + revision = "f3cacc17c85ecb7f1b6a9e373ee85d1480919868" [[projects]] name = "github.com/urfave/cli" diff --git a/vendor/github.com/ugorji/go/codec/decode.go b/vendor/github.com/ugorji/go/codec/decode.go index 1c0817aaf..c8be0bc56 100644 --- a/vendor/github.com/ugorji/go/codec/decode.go +++ b/vendor/github.com/ugorji/go/codec/decode.go @@ -2382,6 +2382,10 @@ func (d *Decoder) wrapErrstr(v interface{}, err *error) { *err = fmt.Errorf("%s decode error [pos %d]: %v", d.hh.Name(), d.r.numread(), v) } +func (d *Decoder) NumBytesRead() int { + return d.r.numread() +} + // -------------------------------------------------- // decSliceHelper assists when decoding into a slice, from a map or an array in the stream. diff --git a/vendor/github.com/ugorji/go/codec/gen.go b/vendor/github.com/ugorji/go/codec/gen.go index 40fcf962f..b4c4031ff 100644 --- a/vendor/github.com/ugorji/go/codec/gen.go +++ b/vendor/github.com/ugorji/go/codec/gen.go @@ -542,7 +542,6 @@ func (x *genRunner) selfer(encode bool) { if encode { x.line(") CodecEncodeSelf(e *" + x.cpfx + "Encoder) {") x.genRequiredMethodVars(true) - // x.enc(genTopLevelVarName, t) x.encVar(genTopLevelVarName, t) } else { x.line(") CodecDecodeSelf(d *" + x.cpfx + "Decoder) {") @@ -649,7 +648,7 @@ func (x *genRunner) encVar(varname string, t reflect.Type) { case reflect.Ptr: telem := t.Elem() tek := telem.Kind() - if tek == reflect.Array || (tek == reflect.Struct && t != timeTyp) { + if tek == reflect.Array || (tek == reflect.Struct && telem != timeTyp) { x.enc(varname, genNonPtr(t)) break }