Skip to content

Commit 6b577b4

Browse files
committed
all: fix printf(var) mistake detected by latest printf checker
For golang/go#69267. Change-Id: I050c167e2e3ce36541e0d71469fb3f5778f5a882 Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/610517 Reviewed-by: Ian Lance Taylor <[email protected]> kokoro-CI: kokoro <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
1 parent 0709f9d commit 6b577b4

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

cmd/pkgsite/main.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,12 @@ func main() {
106106
if *useProxy {
107107
url := os.Getenv("GOPROXY")
108108
if url == "" {
109-
die("GOPROXY environment variable is not set")
109+
dief("GOPROXY environment variable is not set")
110110
}
111111
var err error
112112
serverCfg.Proxy, err = proxy.New(url, nil)
113113
if err != nil {
114-
die("connecting to proxy: %s", err)
114+
dief("connecting to proxy: %s", err)
115115
}
116116
}
117117

@@ -122,7 +122,7 @@ func main() {
122122
ctx := context.Background()
123123
server, err := pkgsite.BuildServer(ctx, serverCfg)
124124
if err != nil {
125-
die(err.Error())
125+
dief("%s", err)
126126
}
127127

128128
addr := *httpAddr
@@ -132,7 +132,7 @@ func main() {
132132

133133
ln, err := net.Listen("tcp", addr)
134134
if err != nil {
135-
die(err.Error())
135+
dief("%s", err)
136136
}
137137

138138
url := "http://" + addr
@@ -150,10 +150,10 @@ func main() {
150150
server.Install(router.Handle, nil, nil)
151151
mw := timeout.Timeout(54 * time.Second)
152152
srv := &http.Server{Addr: addr, Handler: mw(router)}
153-
die("%v", srv.Serve(ln))
153+
dief("%v", srv.Serve(ln))
154154
}
155155

156-
func die(format string, args ...any) {
156+
func dief(format string, args ...any) {
157157
fmt.Fprintf(os.Stderr, format, args...)
158158
fmt.Fprintln(os.Stderr)
159159
os.Exit(1)

internal/frontend/client/client.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ package client
88

99
import (
1010
"encoding/json"
11+
"errors"
1112
"fmt"
1213
"io"
1314
"net/http"
@@ -81,7 +82,7 @@ func (c *Client) fetchJSONPage(url string) (_ []byte, err error) {
8182
}
8283
defer r.Body.Close()
8384
if r.StatusCode != http.StatusOK {
84-
return nil, fmt.Errorf(r.Status)
85+
return nil, errors.New(r.Status)
8586
}
8687
body, err := io.ReadAll(r.Body)
8788
if err != nil {

internal/symbol/generate.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ func (w *Walker) loadImports(pkgPath string) {
289289
// except we also check if a field is Embedded. If so, we ignore that field.
290290
func (w *Walker) emitStructType(name string, typ *types.Struct) {
291291
typeStruct := fmt.Sprintf("type %s struct", name)
292-
w.emitf(typeStruct)
292+
w.emitf("%s", typeStruct)
293293
defer w.pushScope(typeStruct)()
294294
for i := 0; i < typ.NumFields(); i++ {
295295
f := typ.Field(i)
@@ -312,8 +312,8 @@ func (w *Walker) emitStructType(name string, typ *types.Struct) {
312312
// https://go.googlesource.com/go/+/refs/tags/go1.16.6/src/cmd/api/goapi.go#931,
313313
// except we don't check for unexported methods.
314314
func (w *Walker) emitIfaceType(name string, typ *types.Interface) {
315-
typeInterface := fmt.Sprintf("type " + name + " interface")
316-
w.emitf(typeInterface)
315+
typeInterface := fmt.Sprintf("type %s interface", name)
316+
w.emitf("%s", typeInterface)
317317
pop := w.pushScope(typeInterface)
318318

319319
var methodNames []string

0 commit comments

Comments
 (0)