[cpp-xmltooling] branch master updated: Fix up some compile issues.
Scott Cantor
cantor.2 at osu.edu
Fri Nov 9 11:09:34 EST 2018
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=da64c9c3667097f852cbf0b731486b038b5c888e
The following commit(s) were added to refs/heads/master by this push:
new da64c9c Fix up some compile issues.
da64c9c is described below
commit da64c9c3667097f852cbf0b731486b038b5c888e
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Nov 9 11:09:27 2018 -0500
Fix up some compile issues.
---
xmltoolingtest/BadKeyInfoTest.h | 14 +++++++++-----
xmltoolingtest/XMLObjectBaseTestCase.h | 2 +-
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/xmltoolingtest/BadKeyInfoTest.h b/xmltoolingtest/BadKeyInfoTest.h
index a221617..5dea2ef 100644
--- a/xmltoolingtest/BadKeyInfoTest.h
+++ b/xmltoolingtest/BadKeyInfoTest.h
@@ -58,9 +58,9 @@ class BadKeyInfoTest : public CxxTest::TestSuite {
private:
#define SIGBUFFER_SIZE 1024
KeyInfoResolver* m_resolver;
- unsigned char m_toSign[23] = "Nibble A Happy WartHog";
- char m_outSigDSA[SIGBUFFER_SIZE] ={ 0 };
- char m_outSigEC[SIGBUFFER_SIZE] ={ 0 };
+ unsigned char m_toSign[23];
+ char m_outSigDSA[SIGBUFFER_SIZE];
+ char m_outSigEC[SIGBUFFER_SIZE];
unsigned int m_sigLenDSA;
unsigned int m_sigLenEC;
string m_keyInfoPath;
@@ -77,7 +77,11 @@ private:
}
public:
- BadKeyInfoTest() : m_resolver(nullptr), m_sigLenDSA(0), m_sigLenEC(0) {}
+ BadKeyInfoTest() : m_resolver(nullptr), m_sigLenDSA(0), m_sigLenEC(0) {
+ memset(m_outSigDSA, 0, SIGBUFFER_SIZE);
+ memset(m_outSigEC, 0, SIGBUFFER_SIZE);
+ strcpy((char*)m_toSign, "Nibble A Happy WartHog");
+ }
void setUp() {
m_keyInfoPath = data_path + "BadKeyInfo/";
@@ -813,4 +817,4 @@ public:
{
KeyRefTest("KeyInfoRefChild.xml", true);
}
-};
\ No newline at end of file
+};
diff --git a/xmltoolingtest/XMLObjectBaseTestCase.h b/xmltoolingtest/XMLObjectBaseTestCase.h
index a55f3eb..4ad5415 100644
--- a/xmltoolingtest/XMLObjectBaseTestCase.h
+++ b/xmltoolingtest/XMLObjectBaseTestCase.h
@@ -144,7 +144,7 @@ protected:
marshallExtensionAttributes(domElement);
}
- void processChildElement(XMLObject* childXMLObject, const xercesc::DOMElement* root) {
+ void processChildElement(XMLObject* childXMLObject, const xercesc::DOMElement*) {
SimpleXMLObject* simple=dynamic_cast<SimpleXMLObject*>(childXMLObject);
if (simple) {
getSimpleXMLObjects().push_back(simple);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list