SSPCPP-616 - clean up concatenated string literals

[shibboleth/cpp-sp.git] / shibsp / attribute / KeyInfoAttributeDecoder.cpp

diff --git a/shibsp/attribute/KeyInfoAttributeDecoder.cpp b/shibsp/attribute/KeyInfoAttributeDecoder.cpp
index d01d183..ecff131 100644 (file)
--- a/shibsp/attribute/KeyInfoAttributeDecoder.cpp
+++ b/shibsp/attribute/KeyInfoAttributeDecoder.cpp
@@ -28,7 +28,6 @@
 #include "attribute/AttributeDecoder.h"
 #include "attribute/SimpleAttribute.h"
 
-#include <boost/scoped_ptr.hpp>
 #include <saml/saml1/core/Assertions.h>
 #include <saml/saml2/core/Assertions.h>
 #include <xmltooling/XMLToolingConfig.h>
@@ -51,8 +50,15 @@ namespace shibsp {
         KeyInfoAttributeDecoder(const DOMElement* e);
         ~KeyInfoAttributeDecoder() {}
 
+        // deprecated method
         Attribute* decode(
             const vector<string>& ids, const XMLObject* xmlObject, const char* assertingParty=nullptr, const char* relyingParty=nullptr
+            ) const {
+            return decode(nullptr, ids, xmlObject, assertingParty, relyingParty);
+        }
+
+        Attribute* decode(
+            const GenericRequest*, const vector<string>&, const XMLObject*, const char* assertingParty=nullptr, const char* relyingParty=nullptr
             ) const;
 
     private:
@@ -100,10 +106,10 @@ KeyInfoAttributeDecoder::KeyInfoAttributeDecoder(const DOMElement* e)
 }
 
 Attribute* KeyInfoAttributeDecoder::decode(
-    const vector<string>& ids, const XMLObject* xmlObject, const char* assertingParty, const char* relyingParty
+    const GenericRequest*, const vector<string>& ids, const XMLObject* xmlObject, const char* assertingParty, const char* relyingParty
     ) const
 {
-    Category& log = Category::getInstance(SHIBSP_LOGCAT".AttributeDecoder.KeyInfo");
+    Category& log = Category::getInstance(SHIBSP_LOGCAT ".AttributeDecoder.KeyInfo");
 
     if (!xmlObject || !XMLString::equals(saml1::Attribute::LOCAL_NAME, xmlObject->getElementQName().getLocalPart())) {
         log.warn("XMLObject type not recognized by KeyInfoAttributeDecoder, no values returned");
@@ -147,7 +153,7 @@ Attribute* KeyInfoAttributeDecoder::decode(
         }
     }
 
-    for (; v!=stop; ++v) {
+    for (; v != stop; ++v) {
         const KeyInfo* k = dynamic_cast<const KeyInfo*>(*v);
         if (k)
             extract(k, dest);