aboutsummaryrefslogtreecommitdiff
path: root/src/encoding/asn1
diff options
context:
space:
mode:
authorTarmigan Casebolt <tarmigan@gmail.com>2015-08-23 19:51:22 -0700
committerBrad Fitzpatrick <bradfitz@golang.org>2015-08-24 18:24:49 +0000
commit201a05ad2f1d10d03e6fc6853c69836b86e8b948 (patch)
tree9a8b6cd36609a7e7b1d4eb0fd1bd962e7c504fe2 /src/encoding/asn1
parent759210b96207ef51be401338781b2b05d84eea36 (diff)
downloadgo-201a05ad2f1d10d03e6fc6853c69836b86e8b948.tar.gz
go-201a05ad2f1d10d03e6fc6853c69836b86e8b948.zip
encoding/asn1: fix unused assignments
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>
Diffstat (limited to 'src/encoding/asn1')
-rw-r--r--src/encoding/asn1/marshal.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/encoding/asn1/marshal.go b/src/encoding/asn1/marshal.go
index 67a019db2d..c901963186 100644
--- a/src/encoding/asn1/marshal.go
+++ b/src/encoding/asn1/marshal.go
@@ -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
}