From c0d76a7918b721e05ca8a323f84a866a2e88f36c Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Mon, 27 Feb 2023 16:15:03 +0100
Subject: [PATCH] chore: minor cleanup

---
 charger/eebus/eebus.go          |  2 +-
 util/templates/documentation.go | 11 ++---------
 util/templates/template.go      |  2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/charger/eebus/eebus.go b/charger/eebus/eebus.go
index f2a706a18..56489c95d 100644
--- a/charger/eebus/eebus.go
+++ b/charger/eebus/eebus.go
@@ -246,7 +246,7 @@ func pemBlockForKey(priv interface{}) (*pem.Block, error) {
 func GetX509KeyPair(cert tls.Certificate) (string, string, error) {
 	var certValue, keyValue string
 
-	out := &bytes.Buffer{}
+	out := new(bytes.Buffer)
 	err := pem.Encode(out, &pem.Block{Type: "CERTIFICATE", Bytes: cert.Certificate[0]})
 	if err == nil {
 		certValue = out.String()
diff --git a/util/templates/documentation.go b/util/templates/documentation.go
index 0ff65dc9b..a508a037c 100644
--- a/util/templates/documentation.go
+++ b/util/templates/documentation.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	_ "embed"
 	"fmt"
-	"regexp"
 	"text/template"
 
 	"github.com/Masterminds/sprig/v3"
@@ -16,7 +15,7 @@ var documentationTmpl string
 //go:embed documentation_modbus.tpl
 var documentationModbusTmpl string
 
-// RenderProxy renders the proxy template
+// RenderDocumentation renders the documentation template
 func (t *Template) RenderDocumentation(product Product, values map[string]interface{}, lang string) ([]byte, error) {
 	for index, p := range t.Params {
 		for k, v := range values {
@@ -100,11 +99,5 @@ func (t *Template) RenderDocumentation(product Product, values map[string]interf
 		err = tmpl.Execute(out, data)
 	}
 
-	// trim empty lines with whitespace
-	regex, _ := regexp.Compile("\n *\n")
-	string := regex.ReplaceAllString(out.String(), "\n\n")
-	result := new(bytes.Buffer)
-	result.WriteString(string)
-
-	return result.Bytes(), err
+	return []byte(trimEmptyLines(out.String())), err
 }
diff --git a/util/templates/template.go b/util/templates/template.go
index 51d1c9a29..2a9230680 100644
--- a/util/templates/template.go
+++ b/util/templates/template.go
@@ -205,7 +205,7 @@ func (t *Template) ModbusChoices() []string {
 //go:embed proxy.tpl
 var proxyTmpl string
 
-// RenderProxy renders the proxy template
+// RenderProxyWithValues renders the proxy template
 func (t *Template) RenderProxyWithValues(values map[string]interface{}, lang string) ([]byte, error) {
 	tmpl, err := template.New("yaml").Funcs(template.FuncMap(sprig.FuncMap())).Parse(proxyTmpl)
 	if err != nil {