1
0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00

Use errcheck to find unhandled errors (#795)

Signed-off-by: Chris Cummer <chriscummer@me.com>
This commit is contained in:
Chris Cummer
2019-12-17 08:26:16 -08:00
committed by GitHub
parent 04ff03ab1c
commit cde904ff08
44 changed files with 250 additions and 97 deletions

View File

@@ -69,7 +69,7 @@ func (widget *Widget) ipinfo() {
widget.result = err.Error()
return
}
defer response.Body.Close()
defer func() { _ = response.Body.Close() }()
var info ipinfo
err = json.NewDecoder(response.Body).Decode(&info)
if err != nil {
@@ -96,7 +96,7 @@ func (widget *Widget) setResult(info *ipinfo) {
resultBuffer := new(bytes.Buffer)
resultTemplate.Execute(resultBuffer, map[string]string{
err := resultTemplate.Execute(resultBuffer, map[string]string{
"nameColor": widget.settings.colors.name,
"valueColor": widget.settings.colors.value,
"Ip": info.Query,
@@ -111,6 +111,10 @@ func (widget *Widget) setResult(info *ipinfo) {
"Timezone": info.Timezone,
})
if err != nil {
widget.result = err.Error()
}
widget.result = resultBuffer.String()
}

View File

@@ -61,7 +61,7 @@ func (widget *Widget) ipinfo() {
widget.result = err.Error()
return
}
defer response.Body.Close()
defer func() { _ = response.Body.Close() }()
var info ipinfo
err = json.NewDecoder(response.Body).Decode(&info)
@@ -86,7 +86,7 @@ func (widget *Widget) setResult(info *ipinfo) {
resultBuffer := new(bytes.Buffer)
resultTemplate.Execute(resultBuffer, map[string]string{
err := resultTemplate.Execute(resultBuffer, map[string]string{
"subheadingColor": widget.settings.common.Colors.Subheading,
"valueColor": widget.settings.common.Colors.Text,
"Ip": info.Ip,
@@ -99,6 +99,10 @@ func (widget *Widget) setResult(info *ipinfo) {
"Organization": info.Organization,
})
if err != nil {
widget.result = err.Error()
}
widget.result = resultBuffer.String()
}