Fixed additional warnings.

diff --git a/xmlproviders/CredResolvers.cpp b/xmlproviders/CredResolvers.cpp
index ea1ae45..6cba8a6 100644 (file)
--- a/xmlproviders/CredResolvers.cpp
+++ b/xmlproviders/CredResolvers.cpp
@@ -89,7 +89,7 @@ FileResolver::FileResolver(const DOMElement* e)
 #endif
     Category& log=Category::getInstance(XMLPROVIDERS_LOGCAT".CredResolvers");
 
-    format_t format;
+    format_t format=UNKNOWN;
     BIO* in = NULL;
     
     // Move to Key
@@ -231,6 +231,7 @@ FileResolver::FileResolver(const DOMElement* e)
                         throw CredentialException("FileResolver unable to load PKCS12 certificate from file ($1)",params(1,certpath.get()));
                     }
                     break;
+                case UNKNOWN:
             } // end switch
 
         } else {
@@ -252,7 +253,7 @@ FileResolver::FileResolver(const DOMElement* e)
 
         // Load any extra CA files.
         DOMNodeList* nlist=e->getElementsByTagNameNS(::XML::CREDS_NS,SHIB_L(CAPath));
-        for (int i=0; nlist && i<nlist->getLength(); i++) {
+        for (XMLSize_t i=0; nlist && i<nlist->getLength(); i++) {
             if (!nlist->item(i)->hasChildNodes())
                 continue;
             auto_ptr_char capath(static_cast<DOMElement*>(nlist->item(i))->getFirstChild()->getNodeValue());
@@ -300,6 +301,7 @@ FileResolver::FileResolver(const DOMElement* e)
                             throw CredentialException("FileResolver unable to load PKCS12 CA certificate from file ($1)",params(1,capath.get()));
                         }
                         break;
+                    case UNKNOWN:
                 } //end switch
 
                 BIO_free(in);

diff --git a/xmlproviders/XMLAAP.cpp b/xmlproviders/XMLAAP.cpp
index 39bf74d..172ecb8 100644 (file)
--- a/xmlproviders/XMLAAP.cpp
+++ b/xmlproviders/XMLAAP.cpp
@@ -163,7 +163,7 @@ void XMLAAPImpl::init()
 
         // Loop over the AttributeRule elements.
         DOMNodeList* nlist = m_root->getElementsByTagNameNS(::XML::SHIB_NS,SHIB_L(AttributeRule));
-        for (int i=0; nlist && i<nlist->getLength(); i++)
+        for (XMLSize_t i=0; nlist && i<nlist->getLength(); i++)
         {
             AttributeRule* rule=new AttributeRule(static_cast<DOMElement*>(nlist->item(i)));
 #ifdef HAVE_GOOD_STL
@@ -232,7 +232,7 @@ XMLAAPImpl::AttributeRule::AttributeRule(const DOMElement* e) :
     {
         // Process Scope elements.
         DOMNodeList* vlist = static_cast<DOMElement*>(anysite)->getElementsByTagNameNS(::XML::SHIB_NS,SHIB_L(Scope));
-        for (int i=0; vlist && i<vlist->getLength(); i++)
+        for (XMLSize_t i=0; vlist && i<vlist->getLength(); i++)
         {
             m_scoped=true;
             DOMElement* se=static_cast<DOMElement*>(vlist->item(i));
@@ -257,7 +257,7 @@ XMLAAPImpl::AttributeRule::AttributeRule(const DOMElement* e) :
         {
             // Process each Value element.
             vlist = static_cast<DOMElement*>(anysite)->getElementsByTagNameNS(::XML::SHIB_NS,SHIB_L(Value));
-            for (int j=0; vlist && j<vlist->getLength(); j++)
+            for (XMLSize_t j=0; vlist && j<vlist->getLength(); j++)
             {
                 DOMElement* ve=static_cast<DOMElement*>(vlist->item(j));
                 DOMNode* valnode=ve->getFirstChild();
@@ -274,7 +274,7 @@ XMLAAPImpl::AttributeRule::AttributeRule(const DOMElement* e) :
 
     // Loop over the SiteRule elements.
     DOMNodeList* slist = e->getElementsByTagNameNS(::XML::SHIB_NS,SHIB_L(SiteRule));
-    for (int k=0; slist && k<slist->getLength(); k++)
+    for (XMLSize_t k=0; slist && k<slist->getLength(); k++)
     {
         const XMLCh* srulename=static_cast<DOMElement*>(slist->item(k))->getAttributeNS(NULL,SHIB_L(Name));
 #ifdef HAVE_GOOD_STL
@@ -288,7 +288,7 @@ XMLAAPImpl::AttributeRule::AttributeRule(const DOMElement* e) :
 
         // Process Scope elements.
         DOMNodeList* vlist = static_cast<DOMElement*>(slist->item(k))->getElementsByTagNameNS(::XML::SHIB_NS,SHIB_L(Scope));
-        for (int i=0; vlist && i<vlist->getLength(); i++)
+        for (XMLSize_t i=0; vlist && i<vlist->getLength(); i++)
         {
             m_scoped=true;
             DOMElement* se=static_cast<DOMElement*>(vlist->item(i));
@@ -313,7 +313,7 @@ XMLAAPImpl::AttributeRule::AttributeRule(const DOMElement* e) :
         {
             // Process each Value element.
             vlist = static_cast<DOMElement*>(slist->item(k))->getElementsByTagNameNS(::XML::SHIB_NS,SHIB_L(Value));
-            for (int j=0; vlist && j<vlist->getLength(); j++)
+            for (XMLSize_t j=0; vlist && j<vlist->getLength(); j++)
             {
                 DOMElement* ve=static_cast<DOMElement*>(vlist->item(j));
                 DOMNode* valnode=ve->getFirstChild();
@@ -598,7 +598,7 @@ void XMLAAPImpl::AttributeRule::apply(SAMLAttribute& attribute, const IRoleDescr
     // Check each value.
     DOMNodeList* vals=attribute.getValueElements();
     int i2=0;
-    for (int i=0; vals && i < vals->getLength(); i++) {
+    for (XMLSize_t i=0; vals && i < vals->getLength(); i++) {
         if (!accept(static_cast<DOMElement*>(vals->item(i)),role ? dynamic_cast<const IScopedRoleDescriptor*>(role) : NULL))
             attribute.removeValue(i2);
         else

diff --git a/xmlproviders/XMLMetadata.cpp b/xmlproviders/XMLMetadata.cpp
index fc57bb5..046f3d3 100644 (file)
--- a/xmlproviders/XMLMetadata.cpp
+++ b/xmlproviders/XMLMetadata.cpp
@@ -402,9 +402,9 @@ namespace {
         };
 
         XMLMetadataImpl(const char* pathname, const XMLMetadata* wrapper)
-            : ReloadableXMLFileImpl(pathname), m_outer(wrapper), m_rootProvider(NULL), m_rootGroup(NULL) { init(); }
+            : ReloadableXMLFileImpl(pathname), m_rootProvider(NULL), m_rootGroup(NULL), m_outer(wrapper) { init(); }
         XMLMetadataImpl(const DOMElement* e, const XMLMetadata* wrapper)
-            : ReloadableXMLFileImpl(e), m_outer(wrapper), m_rootProvider(NULL), m_rootGroup(NULL) { init(); }
+            : ReloadableXMLFileImpl(e), m_rootProvider(NULL), m_rootGroup(NULL), m_outer(wrapper) { init(); }
         void init();
         ~XMLMetadataImpl();
 
@@ -662,7 +662,7 @@ XMLMetadataImpl::KeyAuthority::~KeyAuthority()
 }
 
 XMLMetadataImpl::Role::Role(const EntityDescriptor* provider, time_t validUntil, const DOMElement* e)
-    : m_provider(provider), m_errorURL(NULL), m_protocolEnumCopy(NULL), m_org(NULL), m_validUntil(validUntil), m_root(e)
+    : m_provider(provider), m_root(e), m_protocolEnumCopy(NULL), m_errorURL(NULL), m_org(NULL), m_validUntil(validUntil)
 {
     // Check the root element namespace. If SAML2, assume it's the std schema.
     if (e && !XMLString::compareString(e->getNamespaceURI(),::XML::SAML2META_NS)) {
@@ -732,7 +732,7 @@ XMLMetadataImpl::SSORole::SSORole(const EntityDescriptor* provider, time_t valid
 {
     // Check the root element namespace. If SAML2, assume it's the std schema.
     if (!XMLString::compareString(e->getNamespaceURI(),::XML::SAML2META_NS)) {
-        int i;
+        XMLSize_t i;
         DOMNodeList* nlist=e->getElementsByTagNameNS(::XML::SAML2META_NS,SHIB_L(ArtifactResolutionService));
         for (i=0; nlist && i<nlist->getLength(); i++)
             m_artifact.add(new IndexedEndpoint(static_cast<DOMElement*>(nlist->item(i))));
@@ -770,7 +770,7 @@ XMLMetadataImpl::ScopedRole::ScopedRole(const DOMElement* e)
         nlist=e->getElementsByTagNameNS(::XML::SHIB_NS,SHIB_L(Domain));
     }
     
-    for (int i=0; nlist && i < nlist->getLength(); i++) {
+    for (XMLSize_t i=0; nlist && i < nlist->getLength(); i++) {
         const XMLCh* dom=(nlist->item(i)->hasChildNodes()) ? nlist->item(i)->getFirstChild()->getNodeValue() : NULL;
         if (dom && *dom) {
             const XMLCh* regexp=static_cast<DOMElement*>(nlist->item(i))->getAttributeNS(NULL,SHIB_L(regexp));
@@ -797,7 +797,7 @@ XMLMetadataImpl::IDPRole::IDPRole(const EntityDescriptor* provider, time_t valid
                 m_sourceId=ext->getFirstChild()->getNodeValue();
         }
         
-        int i;
+        XMLSize_t i;
         DOMNodeList* nlist=e->getElementsByTagNameNS(::XML::SAML2META_NS,SHIB_L(SingleSignOnService));
         for (i=0; nlist && i<nlist->getLength(); i++)
             m_sso.add(new Endpoint(static_cast<DOMElement*>(nlist->item(i))));
@@ -840,7 +840,7 @@ XMLMetadataImpl::IDPRole::IDPRole(const EntityDescriptor* provider, time_t valid
     else {
         m_protocolEnum.push_back(Constants::SHIB_NS);
         m_attrprofs.push_back(Constants::SHIB_ATTRIBUTE_NAMESPACE_URI);
-        int i;
+        XMLSize_t i;
         DOMNodeList* nlist=e->getElementsByTagNameNS(::XML::SHIB_NS,SHIB_L(HandleService));
         for (i=0; nlist && i<nlist->getLength(); i++) {
             // Manufacture an endpoint for the "Shib" binding.
@@ -876,7 +876,7 @@ XMLMetadataImpl::AARole::AARole(const EntityDescriptor* provider, time_t validUn
 {
     // Check the root element namespace. If SAML2, assume it's the std schema.
     if (!XMLString::compareString(e->getNamespaceURI(),::XML::SAML2META_NS)) {
-        int i;
+        XMLSize_t i;
         DOMNodeList* nlist=e->getElementsByTagNameNS(::XML::SAML2META_NS,SHIB_L(AttributeService));
         for (i=0; nlist && i<nlist->getLength(); i++)
             m_query.add(new Endpoint(static_cast<DOMElement*>(nlist->item(i))));
@@ -923,7 +923,7 @@ XMLMetadataImpl::AARole::AARole(const EntityDescriptor* provider, time_t validUn
         m_protocolEnum.push_back(saml::XML::SAML11_PROTOCOL_ENUM);
         m_formats.push_back(Constants::SHIB_NAMEID_FORMAT_URI);
         m_attrprofs.push_back(Constants::SHIB_ATTRIBUTE_NAMESPACE_URI);
-        int i;
+        XMLSize_t i;
         DOMNodeList* nlist=e->getElementsByTagNameNS(::XML::SHIB_NS,SHIB_L(AttributeAuthority));
         for (i=0; nlist && i<nlist->getLength(); i++) {
             // Manufacture an endpoint for the SOAP binding.
@@ -1211,7 +1211,7 @@ XMLMetadata::XMLMetadata(const DOMElement* e) : ReloadableXMLFile(e), m_exclusio
     if (e->hasAttributeNS(NULL,uri)) {
         // First check for explicit enablement of entities.
         DOMNodeList* nlist=e->getElementsByTagName(SHIB_L(Include));
-        for (int i=0; nlist && i<nlist->getLength(); i++) {
+        for (XMLSize_t i=0; nlist && i<nlist->getLength(); i++) {
             if (nlist->item(i)->hasChildNodes()) {
                 auto_ptr_char temp(nlist->item(i)->getFirstChild()->getNodeValue());
                 if (temp.get()) {

diff --git a/xmlproviders/XMLTrust.cpp b/xmlproviders/XMLTrust.cpp
index dcc08a7..441e85b 100644 (file)
--- a/xmlproviders/XMLTrust.cpp
+++ b/xmlproviders/XMLTrust.cpp
@@ -185,7 +185,7 @@ void XMLTrustImpl::init()
 
         // Loop over the KeyAuthority elements.
         DOMNodeList* nlist=m_root->getElementsByTagNameNS(::XML::TRUST_NS,SHIB_L(KeyAuthority));
-        for (int i=0; nlist && i<nlist->getLength(); i++) {
+        for (XMLSize_t i=0; nlist && i<nlist->getLength(); i++) {
             auto_ptr<KeyAuthority> ka(new KeyAuthority());
             
             const DOMElement* e=static_cast<DOMElement*>(nlist->item(i));
@@ -206,7 +206,7 @@ void XMLTrustImpl::init()
             
             // Very rudimentary, grab up all the in-band X509Certificate elements, and flatten into one list.
             DOMNodeList* certlist=k_child->getElementsByTagNameNS(saml::XML::XMLSIG_NS,L(X509Certificate));
-            for (int j=0; certlist && j<certlist->getLength(); j++) {
+            for (XMLSize_t j=0; certlist && j<certlist->getLength(); j++) {
                 auto_ptr_char blob(certlist->item(j)->getFirstChild()->getNodeValue());
                 X509* x=B64_to_X509(blob.get());
                 if (x)
@@ -217,7 +217,7 @@ void XMLTrustImpl::init()
 
             // Now look for externally referenced objects.
             certlist=k_child->getElementsByTagNameNS(saml::XML::XMLSIG_NS,SHIB_L(RetrievalMethod));
-            for (int k=0; certlist && k<certlist->getLength(); k++) {
+            for (XMLSize_t k=0; certlist && k<certlist->getLength(); k++) {
                 DOMElement* cert=static_cast<DOMElement*>(certlist->item(k));
                 if (!XMLString::compareString(cert->getAttributeNS(NULL,SHIB_L(Type)),::XML::XMLSIG_RETMETHOD_RAWX509)) {
                     // DER format
@@ -239,7 +239,7 @@ void XMLTrustImpl::init()
 
             // Very rudimentary, grab up all the in-band X509CRL elements, and flatten into one list.
             certlist=k_child->getElementsByTagNameNS(saml::XML::XMLSIG_NS,SHIB_L(X509CRL));
-            for (int r=0; certlist && r<certlist->getLength(); r++) {
+            for (XMLSize_t r=0; certlist && r<certlist->getLength(); r++) {
                 auto_ptr_char blob(certlist->item(r)->getFirstChild()->getNodeValue());
                 X509_CRL* x=B64_to_CRL(blob.get());
                 if (x)