Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix staticcheck warnings #589

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/age-keygen/keygen.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,5 +158,5 @@ func errorf(format string, v ...interface{}) {
}

func warning(msg string) {
log.Printf("age-keygen: warning: " + msg)
log.Printf("age-keygen: warning: %s", msg)
}
2 changes: 1 addition & 1 deletion internal/format/format.go
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ func (r *StanzaReader) ReadStanza() (s *Stanza, err error) {
b, err := DecodeString(strings.TrimSuffix(string(line), "\n"))
if err != nil {
if bytes.HasPrefix(line, footerPrefix) || bytes.HasPrefix(line, stanzaPrefix) {
return nil, fmt.Errorf("malformed body line %q: stanza ended without a short line\nNote: this might be a file encrypted with an old beta version of age or rage. Use age v1.0.0-beta6 or rage to decrypt it.", line)
return nil, fmt.Errorf("malformed body line %q: stanza ended without a short line\nnote: this might be a file encrypted with an old beta version of age or rage; use age v1.0.0-beta6 or rage to decrypt it", line)
}
return nil, errorf("malformed body line %q: %v", line, err)
}
Expand Down
3 changes: 1 addition & 2 deletions internal/stream/stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"io"

"golang.org/x/crypto/chacha20poly1305"
"golang.org/x/crypto/poly1305"
)

const ChunkSize = 64 * 1024
Expand All @@ -29,7 +28,7 @@ type Reader struct {
}

const (
encChunkSize = ChunkSize + poly1305.TagSize
encChunkSize = ChunkSize + chacha20poly1305.Overhead
lastChunkFlag = 0x01
)

Expand Down
2 changes: 0 additions & 2 deletions plugin/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ package plugin

import (
"bufio"
"bytes"
"fmt"
"io"
"math/rand"
Expand Down Expand Up @@ -382,7 +381,6 @@ type clientConnection struct {
cmd *exec.Cmd
io.Reader // stdout
io.Writer // stdin
stderr bytes.Buffer
close func()
}

Expand Down
Loading