]> Cypherpunks repositories - gostls13.git/commitdiff
encoding/asn1: fix unused assignments
authorTarmigan Casebolt <tarmigan@gmail.com>
Mon, 24 Aug 2015 02:51:22 +0000 (19:51 -0700)
committerBrad Fitzpatrick <bradfitz@golang.org>
Mon, 24 Aug 2015 18:24:49 +0000 (18:24 +0000)
Unused assignment for `err` encoding/asn1/marshal.go:622:3
Unused assignment for `err` encoding/asn1/marshal.go:650:5

Change-Id: I4226238645ce3640f25124cb405444e61439fd3f
Reviewed-on: https://go-review.googlesource.com/13847
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

src/encoding/asn1/marshal.go

index 67a019db2d40677d68517e2d44330419f12e743b..c90196318651dc7bbcb7a83f6b4ecf0097846015 100644 (file)
@@ -627,7 +627,7 @@ func marshalField(out *forkableWriter, v reflect.Value, params fieldParameters)
                })
        }
 
-       return nil
+       return err
 }
 
 // Marshal returns the ASN.1 encoding of val.
@@ -648,5 +648,5 @@ func Marshal(val interface{}) ([]byte, error) {
                return nil, err
        }
        _, err = f.writeTo(&out)
-       return out.Bytes(), nil
+       return out.Bytes(), err
 }