From: Tarmigan Casebolt <tarmigan@gmail.com>
Date: Mon, 24 Aug 2015 02:51:22 +0000 (-0700)
Subject: encoding/asn1: fix unused assignments
X-Git-Tag: go1.6beta1~1287
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=201a05ad2f1d10d03e6fc6853c69836b86e8b948;p=gostls13.git

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>
---

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
 }