Minor cleanup

diff --git a/xmlproviders/XML.cpp b/xmlproviders/XML.cpp
index 779489d..04b3491 100644 (file)
--- a/xmlproviders/XML.cpp
+++ b/xmlproviders/XML.cpp
@@ -210,9 +210,6 @@ const XMLCh XML::Literals::InvalidHandle[]=
 { chLatin_I, chLatin_n, chLatin_v, chLatin_a, chLatin_l, chLatin_i, chLatin_d,
   chLatin_H, chLatin_a, chLatin_n, chLatin_d, chLatin_l, chLatin_e, chNull };
 
-const XMLCh XML::Literals::Location[]=
-{ chLatin_L, chLatin_o, chLatin_c, chLatin_a, chLatin_t, chLatin_i, chLatin_o, chLatin_n, chNull };
-
 const XMLCh XML::Literals::Name[]=
 { chLatin_N, chLatin_a, chLatin_m, chLatin_e, chNull };
 

diff --git a/xmlproviders/XMLMetadata.cpp b/xmlproviders/XMLMetadata.cpp
index b661260..00c400c 100644 (file)
--- a/xmlproviders/XMLMetadata.cpp
+++ b/xmlproviders/XMLMetadata.cpp
@@ -211,7 +211,7 @@ namespace {
         public:
             Endpoint(const DOMElement* e) : m_root(e),
                 m_binding(e->getAttributeNS(NULL,L(Binding))),
-                m_location(e->getAttributeNS(NULL,SHIB_L(Location))),
+                m_location(e->getAttributeNS(NULL,L(Location))),
                 m_resploc(e->getAttributeNS(NULL,SHIB_L(ResponseLocation))) {}
             Endpoint(const XMLCh* binding, const XMLCh* loc)
                 : m_root(NULL), m_binding(binding), m_location(loc), m_resploc(NULL) {}
@@ -889,7 +889,7 @@ XMLMetadataImpl::IDPRole::IDPRole(const EntityDescriptor* provider, time_t valid
         for (i=0; nlist && i<nlist->getLength(); i++) {
             // Manufacture an endpoint for the "Shib" binding.
             m_sso.add(
-                new Endpoint(Constants::SHIB_AUTHNREQUEST_PROFILE_URI,static_cast<DOMElement*>(nlist->item(i))->getAttributeNS(NULL,SHIB_L(Location)))
+                new Endpoint(Constants::SHIB_AUTHNREQUEST_PROFILE_URI,static_cast<DOMElement*>(nlist->item(i))->getAttributeNS(NULL,L(Location)))
                 );
 
             // We're going to "mock up" a KeyDescriptor that contains the specified Name as a ds:KeyName.
@@ -974,7 +974,7 @@ XMLMetadataImpl::AARole::AARole(const EntityDescriptor* provider, time_t validUn
             m_query.add(
                 new Endpoint(
                     SAMLBinding::SOAP,
-                    static_cast<DOMElement*>(nlist->item(i))->getAttributeNS(NULL,SHIB_L(Location))
+                    static_cast<DOMElement*>(nlist->item(i))->getAttributeNS(NULL,L(Location))
                     )
                 );
 

diff --git a/xmlproviders/internal.h b/xmlproviders/internal.h
index 3a80ce0..6f59daa 100644 (file)
--- a/xmlproviders/internal.h
+++ b/xmlproviders/internal.h
@@ -136,7 +136,6 @@ public:
         static const XMLCh ErrorURL[];
         static const XMLCh HandleService[];
         static const XMLCh InvalidHandle[];
-        static const XMLCh Location[];
         static const XMLCh Name[];
         static const XMLCh OriginSite[];
         static const XMLCh SiteGroup[];