diff options
| author | Shulhan <ms@kilabit.info> | 2023-09-14 00:59:40 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2023-09-14 00:59:40 +0700 |
| commit | b89afa24feaee375e914a69b23c2036733991f3e (patch) | |
| tree | fd2c0270a7d7ad644526b77cba409c3956de4820 /lib/http | |
| parent | a352f66260b7172e9553351d44d67c54d48efe7a (diff) | |
| download | pakakeh.go-b89afa24feaee375e914a69b23c2036733991f3e.tar.xz | |
all: fix variable shadowing as reported by shadow tool
The shadow tool [1] report a variable where its name is declared twice
or more, in different scope.
[1] https://pkg.go.dev/golang.org/x/tools@v0.13.0/go/analysis/passes/shadow
Diffstat (limited to 'lib/http')
| -rw-r--r-- | lib/http/client.go | 14 | ||||
| -rw-r--r-- | lib/http/endpoint_response_example_test.go | 6 | ||||
| -rw-r--r-- | lib/http/example_server_test.go | 26 | ||||
| -rw-r--r-- | lib/http/http_test.go | 6 |
4 files changed, 32 insertions, 20 deletions
diff --git a/lib/http/client.go b/lib/http/client.go index fe651672..54a5898e 100644 --- a/lib/http/client.go +++ b/lib/http/client.go @@ -528,10 +528,16 @@ func (client *Client) uncompress(res *http.Response, body []byte) ( // generateFormData generate multipart/form-data body from params. func generateFormData(params map[string][]byte) (contentType, body string, err error) { - sb := new(strings.Builder) - w := multipart.NewWriter(sb) - for k, v := range params { - part, err := w.CreateFormField(k) + var ( + sb = new(strings.Builder) + w = multipart.NewWriter(sb) + + part io.Writer + k string + v []byte + ) + for k, v = range params { + part, err = w.CreateFormField(k) if err != nil { return "", "", err } diff --git a/lib/http/endpoint_response_example_test.go b/lib/http/endpoint_response_example_test.go index de34a11e..6dad54d4 100644 --- a/lib/http/endpoint_response_example_test.go +++ b/lib/http/endpoint_response_example_test.go @@ -60,9 +60,9 @@ func ExampleEndpointResponse() { } go func() { - err := server.Start() - if err != nil { - log.Fatal(err) + var errStart = server.Start() + if errStart != nil { + log.Fatal(errStart) } }() time.Sleep(1 * time.Second) diff --git a/lib/http/example_server_test.go b/lib/http/example_server_test.go index aad952aa..2cf897c0 100644 --- a/lib/http/example_server_test.go +++ b/lib/http/example_server_test.go @@ -16,28 +16,34 @@ func ExampleServer_customHTTPStatusCode() { type CustomResponse struct { Status int `json:"status"` } - exp := CustomResponse{ - Status: http.StatusBadRequest, - } - opts := &ServerOptions{ - Address: "127.0.0.1:8123", - } + var ( + exp = CustomResponse{ + Status: http.StatusBadRequest, + } + + opts = &ServerOptions{ + Address: "127.0.0.1:8123", + } + + srv *Server + err error + ) - testServer, err := NewServer(opts) + srv, err = NewServer(opts) if err != nil { log.Fatal(err) } go func() { - err = testServer.Start() + err = srv.Start() if err != nil { log.Println(err) } }() defer func() { - _ = testServer.Stop(5 * time.Second) + _ = srv.Stop(5 * time.Second) }() epCustom := &Endpoint{ @@ -52,7 +58,7 @@ func ExampleServer_customHTTPStatusCode() { }, } - err = testServer.registerPost(epCustom) + err = srv.registerPost(epCustom) if err != nil { log.Fatal(err) } diff --git a/lib/http/http_test.go b/lib/http/http_test.go index 01c91da7..ea5ace48 100644 --- a/lib/http/http_test.go +++ b/lib/http/http_test.go @@ -78,9 +78,9 @@ func TestMain(m *testing.M) { registerEndpoints() go func() { - err := testServer.Start() - if err != nil { - log.Fatal(err) + var errStart = testServer.Start() + if errStart != nil { + log.Fatal(errStart) } }() |
