Browse Source

vendor: upgrade "ugorji/go" to f3cacc17c85ecb7f1b6a9e373ee85d1480919868

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
Gyuho Lee 7 years ago
parent
commit
b1c86d6baf

+ 1 - 1
Gopkg.lock

@@ -225,7 +225,7 @@
 [[projects]]
 [[projects]]
   name = "github.com/ugorji/go"
   name = "github.com/ugorji/go"
   packages = ["codec"]
   packages = ["codec"]
-  revision = "6a0f936d9527cafa42a8acfa0bf2d6cc94bb6024"
+  revision = "f3cacc17c85ecb7f1b6a9e373ee85d1480919868"
 
 
 [[projects]]
 [[projects]]
   name = "github.com/urfave/cli"
   name = "github.com/urfave/cli"

+ 4 - 0
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)
 	*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.
 // decSliceHelper assists when decoding into a slice, from a map or an array in the stream.

+ 1 - 2
vendor/github.com/ugorji/go/codec/gen.go

@@ -542,7 +542,6 @@ func (x *genRunner) selfer(encode bool) {
 	if encode {
 	if encode {
 		x.line(") CodecEncodeSelf(e *" + x.cpfx + "Encoder) {")
 		x.line(") CodecEncodeSelf(e *" + x.cpfx + "Encoder) {")
 		x.genRequiredMethodVars(true)
 		x.genRequiredMethodVars(true)
-		// x.enc(genTopLevelVarName, t)
 		x.encVar(genTopLevelVarName, t)
 		x.encVar(genTopLevelVarName, t)
 	} else {
 	} else {
 		x.line(") CodecDecodeSelf(d *" + x.cpfx + "Decoder) {")
 		x.line(") CodecDecodeSelf(d *" + x.cpfx + "Decoder) {")
@@ -649,7 +648,7 @@ func (x *genRunner) encVar(varname string, t reflect.Type) {
 	case reflect.Ptr:
 	case reflect.Ptr:
 		telem := t.Elem()
 		telem := t.Elem()
 		tek := telem.Kind()
 		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))
 			x.enc(varname, genNonPtr(t))
 			break
 			break
 		}
 		}