Convert from NULL macro to nullptr, remove unused zlib code.

[shibboleth/cpp-opensaml.git] / saml / saml2 / metadata / impl / SignatureMetadataFilter.cpp

diff --git a/saml/saml2/metadata/impl/SignatureMetadataFilter.cpp b/saml/saml2/metadata/impl/SignatureMetadataFilter.cpp
index ce80fe9..2e6bbd6 100644 (file)
--- a/saml/saml2/metadata/impl/SignatureMetadataFilter.cpp
+++ b/saml/saml2/metadata/impl/SignatureMetadataFilter.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright 2001-2009 Internet2
+ *  Copyright 2001-2010 Internet2
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,9 +54,9 @@ namespace opensaml {
             Lockable* lock() {return this;}
             void unlock() {}
 
-            const Credential* resolve(const CredentialCriteria* criteria=NULL) const {return NULL;}
+            const Credential* resolve(const CredentialCriteria* criteria=nullptr) const {return nullptr;}
             vector<const Credential*>::size_type resolve(
-                vector<const Credential*>& results, const CredentialCriteria* criteria=NULL
+                vector<const Credential*>& results, const CredentialCriteria* criteria=nullptr
                 ) const {return 0;}
         };
 
@@ -102,29 +102,29 @@ static const XMLCh verifyRoles[] =          UNICODE_LITERAL_11(v,e,r,i,f,y,R,o,l
 static const XMLCh verifyName[] =           UNICODE_LITERAL_10(v,e,r,i,f,y,N,a,m,e);
 
 SignatureMetadataFilter::SignatureMetadataFilter(const DOMElement* e)
-    : m_verifyRoles(false), m_verifyName(true), m_credResolver(NULL), m_trust(NULL), m_log(Category::getInstance(SAML_LOGCAT".MetadataFilter.Signature"))
+    : m_verifyRoles(false), m_verifyName(true), m_credResolver(nullptr), m_trust(nullptr), m_log(Category::getInstance(SAML_LOGCAT".MetadataFilter.Signature"))
 {
-    const XMLCh* flag = e ? e->getAttributeNS(NULL,verifyRoles) : NULL;
+    const XMLCh* flag = e ? e->getAttributeNS(nullptr,verifyRoles) : nullptr;
     m_verifyRoles = (flag && (*flag == chLatin_t || *flag == chDigit_1));
 
-    flag = e ? e->getAttributeNS(NULL,verifyName) : NULL;
+    flag = e ? e->getAttributeNS(nullptr,verifyName) : nullptr;
     m_verifyName = !(flag && (*flag == chLatin_f || *flag == chDigit_0));
 
-    if (e && e->hasAttributeNS(NULL,certificate)) {
+    if (e && e->hasAttributeNS(nullptr,certificate)) {
         // Use a file-based credential resolver rooted here.
         m_credResolver = XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(FILESYSTEM_CREDENTIAL_RESOLVER,e);
         return;
     }
 
-    DOMElement* sub = e ? XMLHelper::getFirstChildElement(e, _CredentialResolver) : NULL;
-    auto_ptr_char t(sub ? sub->getAttributeNS(NULL,type) : NULL);
+    DOMElement* sub = e ? XMLHelper::getFirstChildElement(e, _CredentialResolver) : nullptr;
+    auto_ptr_char t(sub ? sub->getAttributeNS(nullptr,type) : nullptr);
     if (t.get()) {
         m_credResolver = XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(t.get(),sub);
         return;
     }
 
-    sub = e ? XMLHelper::getFirstChildElement(e, _TrustEngine) : NULL;
-    auto_ptr_char t2(sub ? sub->getAttributeNS(NULL,type) : NULL);
+    sub = e ? XMLHelper::getFirstChildElement(e, _TrustEngine) : nullptr;
+    auto_ptr_char t2(sub ? sub->getAttributeNS(nullptr,type) : nullptr);
     if (t2.get()) {
         TrustEngine* trust = XMLToolingConfig::getConfig().TrustEngineManager.newPlugin(t2.get(),sub);
         if (!(m_trust = dynamic_cast<SignatureTrustEngine*>(trust))) {
@@ -357,7 +357,7 @@ void SignatureMetadataFilter::doFilter(EntityDescriptor& entity, bool rootObject
         catch (exception& e) {
             auto_ptr_char id(entity.getEntityID());
             m_log.warn("filtering out affiliation from entity (%s) after failed signature check: %s", id.get(), e.what());
-            entity.setAffiliationDescriptor(NULL);
+            entity.setAffiliationDescriptor(nullptr);
         }
     }
 }