From: tengufromsky <nick27surgut@gmail.com>
Date: Sun, 15 Apr 2018 16:08:56 +0000 (+0300)
Subject: encoding/xml: remove unnecessary if conditions
X-Git-Tag: go1.11beta1~822
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=eef79b6712b306379f5b98259820b1a9736ecbbd;p=gostls13.git

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>
---

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='...'`