summaryrefslogtreecommitdiff
diff options
authorMiguel Pires <miguel.pires@canonical.com>2023-06-08 09:54:46 +0100
committerMiguel Pires <miguelpires94@gmail.com>2023-06-12 14:37:13 +0100
commitb73965e68f9a351901555e258723806f5c21e66f (patch)
treef7c8d32dfec25c0abc2bd8a1937cf0dd586a9dea
parentb44704463a3d1089a08a0449bbd03485ad280d5f (diff)
bootloader: remove naked return
Removes a naked return that the latest version of golangci-lint complains about. Signed-off-by: Miguel Pires <miguel.pires@canonical.com>
-rw-r--r--bootloader/lkenv/lkenv_test.go12
1 files changed, 6 insertions, 6 deletions
diff --git a/bootloader/lkenv/lkenv_test.go b/bootloader/lkenv/lkenv_test.go
index e83fbb4228..02fe109d90 100644
--- a/bootloader/lkenv/lkenv_test.go
+++ b/bootloader/lkenv/lkenv_test.go
@@ -67,17 +67,17 @@ func (l *lkenvTestSuite) SetUpTest(c *C) {
}
// unpack test data packed with gzip
-func unpackTestData(data []byte) (resData []byte, err error) {
+func unpackTestData(data []byte) ([]byte, error) {
b := bytes.NewBuffer(data)
- var r io.Reader
- r, err = gzip.NewReader(b)
+ r, err := gzip.NewReader(b)
if err != nil {
- return
+ return nil, err
}
+
var env bytes.Buffer
_, err = env.ReadFrom(r)
if err != nil {
- return
+ return nil, err
}
return env.Bytes(), nil
}
@@ -94,7 +94,7 @@ func (l *lkenvTestSuite) TestCtoGoString(c *C) {
{[]byte{'a', 'b', 'c', 'd', 0}, "abcd"},
// no trailing \0 - assume corrupted "" ?
{[]byte{'a', 'b', 'c', 'd', 'e'}, ""},
- // first \0 is the cutof
+ // first \0 is the cutoff
{[]byte{'a', 'b', 0, 'z', 0}, "ab"},
} {
c.Check(lkenv.CToGoString(t.input), Equals, t.expected)