From 402593c5c684c8080c3cc7e22fd625ba49921d37 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Sat, 18 Jan 2020 12:43:47 +0100
Subject: [PATCH] carddav: define XML names as globals

---
 carddav/carddav.go  |  2 --
 carddav/client.go   | 10 ++--------
 carddav/elements.go |  6 +++++-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/carddav/carddav.go b/carddav/carddav.go
index ada6659..c02903e 100644
--- a/carddav/carddav.go
+++ b/carddav/carddav.go
@@ -1,8 +1,6 @@
 package carddav
 
 import (
-	"encoding/xml"
-
 	"github.com/emersion/go-vcard"
 )
 
diff --git a/carddav/client.go b/carddav/client.go
index 032cc70..0927820 100644
--- a/carddav/client.go
+++ b/carddav/client.go
@@ -2,7 +2,6 @@ package carddav
 
 import (
 	"bytes"
-	"encoding/xml"
 	"net/http"
 
 	"github.com/emersion/go-vcard"
@@ -34,9 +33,7 @@ func (c *Client) SetBasicAuth(username, password string) {
 }
 
 func (c *Client) FindAddressBookHomeSet(principal string) (string, error) {
-	name := xml.Name{namespace, "addressbook-home-set"}
-	propfind := internal.NewPropNamePropfind(name)
-
+	propfind := internal.NewPropNamePropfind(addressBookHomeSetName)
 	resp, err := c.ic.PropfindFlat(principal, propfind)
 	if err != nil {
 		return "", err
@@ -51,10 +48,7 @@ func (c *Client) FindAddressBookHomeSet(principal string) (string, error) {
 }
 
 func (c *Client) FindAddressBooks(addressBookHomeSet string) ([]AddressBook, error) {
-	resTypeName := xml.Name{"DAV:", "resourcetype"}
-	descName := xml.Name{namespace, "addressbook-description"}
-	propfind := internal.NewPropNamePropfind(resTypeName, descName)
-
+	propfind := internal.NewPropNamePropfind(internal.ResourceTypeName, addressBookDescriptionName)
 	ms, err := c.ic.Propfind(addressBookHomeSet, internal.DepthOne, propfind)
 	if err != nil {
 		return nil, err
diff --git a/carddav/elements.go b/carddav/elements.go
index 7b94e78..47ff275 100644
--- a/carddav/elements.go
+++ b/carddav/elements.go
@@ -8,7 +8,11 @@ import (
 
 const namespace = "urn:ietf:params:xml:ns:carddav"
 
-var addressBookName = xml.Name{namespace, "addressbook"}
+var (
+	addressBookName            = xml.Name{namespace, "addressbook"}
+	addressBookHomeSetName     = xml.Name{namespace, "addressbook-home-set"}
+	addressBookDescriptionName = xml.Name{namespace, "addressbook-description"}
+)
 
 type addressbookHomeSet struct {
 	XMLName xml.Name `xml:"urn:ietf:params:xml:ns:carddav addressbook-home-set"`