[cpp-xmltooling] branch master updated: Fix warnings.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-xmltooling.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-xmltooling.git;a=commit;h=77c0604502a8317d79300b22fe33fe8913d9a6be

The following commit(s) were added to refs/heads/master by this push:
       new  77c0604   Fix warnings.
77c0604 is described below

commit 77c0604502a8317d79300b22fe33fe8913d9a6be
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Mar 26 18:54:36 2018 -0400

    Fix warnings.
---
 xmltooling/security/impl/SecurityHelper.cpp | 4 ++--
 xmltooling/util/ReloadableXMLFile.cpp       | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/xmltooling/security/impl/SecurityHelper.cpp b/xmltooling/security/impl/SecurityHelper.cpp
index 5f817f2..03d1c5f 100644
--- a/xmltooling/security/impl/SecurityHelper.cpp
+++ b/xmltooling/security/impl/SecurityHelper.cpp
@@ -288,7 +288,7 @@ vector<XSECCryptoX509*>::size_type SecurityHelper::loadCertificatesFromFile(
 
         // The format should be known, so parse accordingly.
         if (!strcmp(format, "PEM")) {
-            while (x=PEM_read_bio_X509(in, nullptr, nullptr, nullptr)) {
+            while ((x=PEM_read_bio_X509(in, nullptr, nullptr, nullptr))) {
                 certs.push_back(new OpenSSLCryptoX509(x));
                 X509_free(x);
             }
@@ -382,7 +382,7 @@ vector<XSECCryptoX509CRL*>::size_type SecurityHelper::loadCRLsFromFile(
 
         X509_CRL* crl=nullptr;
         if (!strcmp(format, "PEM")) {
-            while (crl=PEM_read_bio_X509_CRL(in, nullptr, nullptr, nullptr)) {
+            while ((crl=PEM_read_bio_X509_CRL(in, nullptr, nullptr, nullptr))) {
                 crls.push_back(new OpenSSLCryptoX509CRL(crl));
                 X509_CRL_free(crl);
             }
diff --git a/xmltooling/util/ReloadableXMLFile.cpp b/xmltooling/util/ReloadableXMLFile.cpp
index ea15d32..9f402cd 100644
--- a/xmltooling/util/ReloadableXMLFile.cpp
+++ b/xmltooling/util/ReloadableXMLFile.cpp
@@ -81,12 +81,14 @@ static const XMLCh reloadChanges[] =    UNICODE_LITERAL_13(r,e,l,o,a,d,C,h,a,n,g
 static const XMLCh reloadInterval[] =   UNICODE_LITERAL_14(r,e,l,o,a,d,I,n,t,e,r,v,a,l);
 static const XMLCh maxRefreshDelay[] =  UNICODE_LITERAL_15(m,a,x,R,e,f,r,e,s,h,D,e,l,a,y);
 static const XMLCh backingFilePath[] =  UNICODE_LITERAL_15(b,a,c,k,i,n,g,F,i,l,e,P,a,t,h);
+
+#ifndef XMLTOOLING_LITE
 static const XMLCh type[] =             UNICODE_LITERAL_4(t,y,p,e);
 static const XMLCh certificate[] =      UNICODE_LITERAL_11(c,e,r,t,i,f,i,c,a,t,e);
 static const XMLCh signerName[] =       UNICODE_LITERAL_10(s,i,g,n,e,r,N,a,m,e);
 static const XMLCh _TrustEngine[] =     UNICODE_LITERAL_11(T,r,u,s,t,E,n,g,i,n,e);
 static const XMLCh _CredentialResolver[] = UNICODE_LITERAL_18(C,r,e,d,e,n,t,i,a,l,R,e,s,o,l,v,e,r);
-
+#endif
 
 ReloadableXMLFile::ReloadableXMLFile(const DOMElement* e, Category& log, bool startReloadThread)
     : m_root(e), m_local(true), m_validate(false), m_filestamp(0), m_reloadInterval(0),

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.