SystemSh0cker/gocsaf
1
0
Fork 0
mirror of https://github.com/gocsaf/csaf.git synced 2025-12-22 11:55:40 +01:00
Code Issues Releases Activity Actions

Fixed issues found by staticcheck. (#227)

Browse source
This commit is contained in:
Sascha L. Teichmann 2022-07-14 18:38:37 +02:00 • committed by GitHub
parent 2ac7940206
commit 56a047cdde
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
util/client.go
View file

@ -41,7 +41,7 @@ type LimitingClient struct {
// Do implements the respective method of the Client interface. // Do implements the respective method of the Client interface.
func (lc *LoggingClient) Do(req *http.Request) (*http.Response, error) { func (lc *LoggingClient) Do(req *http.Request) (*http.Response, error) {
log.Printf("[DO]: %s\n", req.URL.String()) log.Printf("[DO]: %s\n", req.URL.String())
return lc.Do(req) return lc.Client.Do(req)
} }
// Get implements the respective method of the Client interface. // Get implements the respective method of the Client interface.
@ -53,19 +53,19 @@ func (lc *LoggingClient) Get(url string) (*http.Response, error) {
// Head implements the respective method of the Client interface. // Head implements the respective method of the Client interface.
func (lc *LoggingClient) Head(url string) (*http.Response, error) { func (lc *LoggingClient) Head(url string) (*http.Response, error) {
log.Printf("[HEAD]: %s\n", url) log.Printf("[HEAD]: %s\n", url)
return lc.Head(url) return lc.Client.Head(url)
} }
// Post implements the respective method of the Client interface. // Post implements the respective method of the Client interface.
func (lc *LoggingClient) Post(url, contentType string, body io.Reader) (*http.Response, error) { func (lc *LoggingClient) Post(url, contentType string, body io.Reader) (*http.Response, error) {
log.Printf("[POST]: %s\n", url) log.Printf("[POST]: %s\n", url)
return lc.Post(url, contentType, body) return lc.Client.Post(url, contentType, body)
} }
// PostForm implements the respective method of the Client interface. // PostForm implements the respective method of the Client interface.
func (lc *LoggingClient) PostForm(url string, data url.Values) (*http.Response, error) { func (lc *LoggingClient) PostForm(url string, data url.Values) (*http.Response, error) {
log.Printf("[POST FORM]: %s\n", url) log.Printf("[POST FORM]: %s\n", url)
return lc.PostForm(url, data) return lc.Client.PostForm(url, data)
} }
// Do implements the respective method of the Client interface. // Do implements the respective method of the Client interface.

4
util/file.go
View file

@ -29,9 +29,7 @@ var invalidRune = regexp.MustCompile(`[^+\-a-z0-9]+`) // invalid runes + `_`
// specifies valid runes as 'a' to 'z', '0' to '9' and '+', '-', '_'. // specifies valid runes as 'a' to 'z', '0' to '9' and '+', '-', '_'.
func CleanFileName(s string) string { func CleanFileName(s string) string {
s = strings.ToLower(s) s = strings.ToLower(s)
if strings.HasSuffix(s, ".json") { s = strings.TrimSuffix(s, ".json")
s = s[:len(s)-len(".json")]
}
return invalidRune.ReplaceAllString(s, "_") + ".json" return invalidRune.ReplaceAllString(s, "_") + ".json"
} }