aboutsummaryrefslogtreecommitdiff
path: root/src/encoding/xml
diff options
context:
space:
mode:
authortengufromsky <nick27surgut@gmail.com>2018-04-15 19:08:56 +0300
committerBrad Fitzpatrick <bradfitz@golang.org>2018-04-15 16:40:39 +0000
commiteef79b6712b306379f5b98259820b1a9736ecbbd (patch)
tree0fb3c41fac720c322e3ff7879c695e588cdb74e3 /src/encoding/xml
parent49e3e436e71a54f16eb15960bd77ecf554ccc905 (diff)
downloadgo-eef79b6712b306379f5b98259820b1a9736ecbbd.tar.gz
go-eef79b6712b306379f5b98259820b1a9736ecbbd.zip
encoding/xml: remove unnecessary if conditions
Fixes gosimple warning "if err != nil { return err }; return nil' can be simplified to 'return err" Change-Id: Ibbc717fb066ff41ab35c481b6d44980ac809ae09 Reviewed-on: https://go-review.googlesource.com/107018 Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/encoding/xml')
-rw-r--r--src/encoding/xml/xml.go12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/encoding/xml/xml.go b/src/encoding/xml/xml.go
index 5a51d4c979..fb52eec5f4 100644
--- a/src/encoding/xml/xml.go
+++ b/src/encoding/xml/xml.go
@@ -1932,10 +1932,8 @@ func escapeText(w io.Writer, s []byte, escapeNewline bool) error {
}
last = i
}
- if _, err := w.Write(s[last:]); err != nil {
- return err
- }
- return nil
+ _, err := w.Write(s[last:])
+ return err
}
// EscapeString writes to p the properly escaped XML equivalent
@@ -2018,10 +2016,8 @@ func emitCDATA(w io.Writer, s []byte) error {
}
s = s[i:]
}
- if _, err := w.Write(cdataEnd); err != nil {
- return err
- }
- return nil
+ _, err := w.Write(cdataEnd)
+ return err
}
// procInst parses the `param="..."` or `param='...'`