Fixed additional warnings.

diff --git a/shib-target/RPCListener.cpp b/shib-target/RPCListener.cpp
index 6e3340f..1692b6c 100644 (file)
--- a/shib-target/RPCListener.cpp
+++ b/shib-target/RPCListener.cpp
@@ -58,7 +58,7 @@ namespace shibtarget {
     {
     public:
         RPCHandlePool(Category& log, const RPCListener* listener)
-            : m_log(log), m_listener(listener), m_lock(shibboleth::Mutex::create()) {}
+            : m_listener(listener), m_log(log), m_lock(shibboleth::Mutex::create()) {}
         ~RPCHandlePool();
         RPCHandle* get();
         void put(RPCHandle*);
@@ -494,7 +494,7 @@ void RPCListener::ping(int& i) const
     rpc.pool();
 }
 
-RPCHandle::RPCHandle(Category& log) : m_clnt(NULL), m_sock((IListener::ShibSocket)0), m_log(log)
+RPCHandle::RPCHandle(Category& log) : m_log(log), m_clnt(NULL), m_sock((IListener::ShibSocket)0)
 {
     m_log.debug("New RPCHandle created: %p", this);
 }

diff --git a/shib-target/XMLRequestMapper.cpp b/shib-target/XMLRequestMapper.cpp
index e7b2ea2..83d4939 100644 (file)
--- a/shib-target/XMLRequestMapper.cpp
+++ b/shib-target/XMLRequestMapper.cpp
@@ -162,7 +162,6 @@ Override::Override(const DOMElement* e, Category& log, const Override* base) : m
         loadACL(e,log);
     
         // Handle nested Paths.
-        unsigned int count=0;
         DOMElement* path=saml::XML::getFirstChildElement(e,shibtarget::XML::SHIBTARGET_NS,SHIBT_L(Path));
         while (path) {
             const XMLCh* n=path->getAttributeNS(NULL,SHIBT_L(name));
@@ -348,7 +347,7 @@ void XMLRequestMapperImpl::init()
     
         // Loop over the Host elements.
         DOMNodeList* nlist = ReloadableXMLFileImpl::m_root->getElementsByTagNameNS(shibtarget::XML::SHIBTARGET_NS,SHIBT_L(Host));
-        for (int i=0; nlist && i<nlist->getLength(); i++) {
+        for (XMLSize_t i=0; nlist && i<nlist->getLength(); i++) {
             DOMElement* host=static_cast<DOMElement*>(nlist->item(i));
             const XMLCh* n=host->getAttributeNS(NULL,SHIBT_L(name));
             if (!n || !*n) {

diff --git a/shib-target/shib-ccache.cpp b/shib-target/shib-ccache.cpp
index 4251d1a..6bb4394 100644 (file)
--- a/shib-target/shib-ccache.cpp
+++ b/shib-target/shib-ccache.cpp
@@ -193,9 +193,10 @@ IPlugIn* MemoryCacheFactory(const DOMElement* e)
 /******************************************************************************/
 
 InternalCCache::InternalCCache(const DOMElement* e)
-    : m_root(e), m_AATimeout(30), m_AAConnectTimeout(15), m_defaultLifetime(1800), m_retryInterval(300),
-        m_strictValidity(true), m_propagateErrors(false), lock(RWLock::create()),
-        log (&Category::getInstance(SHIBT_LOGCAT".SessionCache"))
+    : m_root(e), lock(RWLock::create()), log(&Category::getInstance(SHIBT_LOGCAT".SessionCache")),
+        m_AATimeout(30), m_AAConnectTimeout(15), m_defaultLifetime(1800), m_retryInterval(300),
+        m_strictValidity(true), m_propagateErrors(false) 
+        
 {
     const XMLCh* tag=m_root->getAttributeNS(NULL,AATimeout);
     if (tag && *tag) {
@@ -463,8 +464,8 @@ InternalCCacheEntry::InternalCCacheEntry(
     const IRoleDescriptor* source,
     time_t created,
     time_t accessed
-    ) : m_cache(cache), m_application_id(application->getId()), m_profile(profile), m_auth_statement(s),
-        m_response_pre(r), m_response_post(NULL), m_responseCreated(r ? time(NULL) : 0), m_lastRetry(0)
+    ) : m_application_id(application->getId()), m_responseCreated(r ? time(NULL) : 0), m_lastRetry(0),
+        m_profile(profile), m_auth_statement(s), m_response_pre(r), m_response_post(NULL), m_cache(cache) 
 {
   if (!cache || !key || !s || !client_addr || !providerId) {
     if (cache) cache->log->error("missing required cache entry details");

diff --git a/shib-target/shib-handlers.cpp b/shib-target/shib-handlers.cpp
index 98dff57..2616517 100644 (file)
--- a/shib-target/shib-handlers.cpp
+++ b/shib-target/shib-handlers.cpp
@@ -235,7 +235,7 @@ pair<bool,void*> SessionInitiator::ShibAuthnRequest(
     if (shire) ACSloc+=shire->getString("Location").second;
     
     char timebuf[16];
-    sprintf(timebuf,"%u",time(NULL));
+    sprintf(timebuf,"%lu",time(NULL));
     string req=string(dest) + "?shire=" + CgiParse::url_encode(ACSloc.c_str()) + "&time=" + timebuf;
 
     // How should the resource value be preserved?

diff --git a/shib-target/shib-ini.cpp b/shib-target/shib-ini.cpp
index d493ef9..141d256 100644 (file)
--- a/shib-target/shib-ini.cpp
+++ b/shib-target/shib-ini.cpp
@@ -106,9 +106,9 @@ namespace shibtarget {
     {
     public:
         XMLConfigImpl(const char* pathname, bool first, const XMLConfig* outer)
-            : ReloadableXMLFileImpl(pathname), m_outer(outer), m_requestMapper(NULL) { init(first); }
+            : ReloadableXMLFileImpl(pathname), m_requestMapper(NULL), m_outer(outer) { init(first); }
         XMLConfigImpl(const DOMElement* e, bool first, const XMLConfig* outer)
-            : ReloadableXMLFileImpl(e), m_outer(outer), m_requestMapper(NULL) { init(first); }
+            : ReloadableXMLFileImpl(e), m_requestMapper(NULL), m_outer(outer) { init(first); }
         ~XMLConfigImpl();
         
         IRequestMapper* m_requestMapper;
@@ -356,7 +356,7 @@ XMLApplication::XMLApplication(
     const DOMElement* e,
     const XMLApplication* base
     ) : m_ini(ini), m_base(base), m_profile(NULL), m_binding(NULL), m_bindingHook(NULL),
-        m_credDefault(NULL), m_sessionInitDefault(NULL), m_acsDefault(NULL)
+        m_acsDefault(NULL), m_sessionInitDefault(NULL), m_credDefault(NULL)
 {
 #ifdef _DEBUG
     saml::NDC ndc("XMLApplication");
@@ -429,7 +429,7 @@ XMLApplication::XMLApplication(
         }
         
         // Process general configuration elements.
-        int i;
+        XMLSize_t i;
         DOMNodeList* nlist=e->getElementsByTagNameNS(saml::XML::SAML_NS,L(AttributeDesignator));
         for (i=0; nlist && i<nlist->getLength(); i++)
             if (nlist->item(i)->getParentNode()->isSameNode(e))
@@ -1038,7 +1038,7 @@ void XMLConfigImpl::init(bool first)
 
             // Now we load any attribute factories.
             DOMNodeList* nlist=ReloadableXMLFileImpl::m_root->getElementsByTagNameNS(shibtarget::XML::SHIBTARGET_NS,SHIBT_L(AttributeFactory));
-            for (int i=0; nlist && i<nlist->getLength(); i++) {
+            for (XMLSize_t i=0; nlist && i<nlist->getLength(); i++) {
                 auto_ptr_char type(static_cast<DOMElement*>(nlist->item(i))->getAttributeNS(NULL,SHIBT_L(type)));
                 log.info("building Attribute factory of type %s...",type.get());
                 try {
@@ -1092,7 +1092,7 @@ void XMLConfigImpl::init(bool first)
         DOMNodeList* nlist;
         if (conf.isEnabled(ShibTargetConfig::Credentials)) {
             nlist=ReloadableXMLFileImpl::m_root->getElementsByTagNameNS(shibtarget::XML::SHIBTARGET_NS,SHIBT_L(CredentialsProvider));
-            for (int i=0; nlist && i<nlist->getLength(); i++) {
+            for (XMLSize_t i=0; nlist && i<nlist->getLength(); i++) {
                 auto_ptr_char type(static_cast<DOMElement*>(nlist->item(i))->getAttributeNS(NULL,SHIBT_L(type)));
                 log.info("building credentials provider of type %s...",type.get());
                 try {
@@ -1126,7 +1126,7 @@ void XMLConfigImpl::init(bool first)
         
         // Load any overrides.
         nlist=app->getElementsByTagNameNS(shibtarget::XML::SHIBTARGET_NS,SHIBT_L(Application));
-        for (int j=0; nlist && j<nlist->getLength(); j++) {
+        for (XMLSize_t j=0; nlist && j<nlist->getLength(); j++) {
             XMLApplication* iapp=new XMLApplication(m_outer,m_creds,static_cast<DOMElement*>(nlist->item(j)),defapp);
             if (m_appmap.find(iapp->getId())!=m_appmap.end()) {
                 log.fatal("found conf:Application element with duplicate Id attribute");

diff --git a/shib-target/shib-sock.cpp b/shib-target/shib-sock.cpp
index 9985b02..7a726de 100644 (file)
--- a/shib-target/shib-sock.cpp
+++ b/shib-target/shib-sock.cpp
@@ -94,8 +94,8 @@ TCPListener::TCPListener(const DOMElement* e) : RPCListener(e), m_address("127.0
         auto_ptr_char temp(tag);
         string sockacl=temp.get();
         if (sockacl.length()) {
-            int j = 0;
-            for (int i=0;  i < sockacl.length();  i++) {
+            unsigned int j = 0;
+            for (unsigned int i=0;  i < sockacl.length();  i++) {
                 if (sockacl.at(i)==' ') {
                     m_acl.push_back(sockacl.substr(j, i-j));
                     j = i+1;

diff --git a/shib-target/shib-target.cpp b/shib-target/shib-target.cpp
index 1ad8780..b84e5b1 100644 (file)
--- a/shib-target/shib-target.cpp
+++ b/shib-target/shib-target.cpp
@@ -793,7 +793,7 @@ void* ShibTarget::returnOK(void)
  * Shib Target Private implementation
  */
 
-ShibTargetPriv::ShibTargetPriv() : m_app(NULL), m_mapper(NULL), m_conf(NULL), m_Config(NULL), m_cacheEntry(NULL) {}
+ShibTargetPriv::ShibTargetPriv() : m_app(NULL), m_cacheEntry(NULL), m_Config(NULL), m_conf(NULL), m_mapper(NULL) {}
 
 ShibTargetPriv::~ShibTargetPriv()
 {

diff --git a/siterefresh/siterefresh.cpp b/siterefresh/siterefresh.cpp
index f86a84d..7dab0e3 100644 (file)
--- a/siterefresh/siterefresh.cpp
+++ b/siterefresh/siterefresh.cpp
@@ -85,7 +85,7 @@ void verifySignature(DOMDocument* doc, DOMNode* sigNode, const char* cert=NULL)
                 if (!URI || !*URI || (*URI==chPound &&
                         !XMLString::compareString(&URI[1],static_cast<DOMElement*>(sigNode->getParentNode())->getAttributeNS(NULL,ID)))) {
                     DSIGTransformList* tlist=ref->getTransforms();
-                    for (int i=0; tlist && i<tlist->getSize(); i++) {
+                    for (unsigned int i=0; tlist && i<tlist->getSize(); i++) {
                         if (tlist->item(i)->getTransformType()==TRANSFORM_ENVELOPED_SIGNATURE)
                             valid=true;
                         else if (tlist->item(i)->getTransformType()!=TRANSFORM_EXC_C14N) {
@@ -253,7 +253,7 @@ int main(int argc,char* argv[])
 
         // Verify all signatures.
         DOMNodeList* siglist=doc->getElementsByTagNameNS(saml::XML::XMLSIG_NS,L(Signature));
-        for (int i=0; siglist && i<siglist->getLength(); i++)
+        for (XMLSize_t i=0; siglist && i<siglist->getLength(); i++)
             verifySignature(doc,siglist->item(i),cert_param);
 
         if (out_param) {