You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by bl...@apache.org on 2006/10/15 07:16:00 UTC
svn commit: r464121 - in /xml/security/trunk/c/src:
canon/XSECC14n20010315.cpp dsig/DSIGKeyInfoList.cpp dsig/DSIGReference.cpp
transformers/TXFMEnvelope.cpp utils/XSECNameSpaceExpander.cpp
xenc/impl/XENCCipherImpl.cpp
Author: blautenb
Date: Sat Oct 14 22:15:59 2006
New Revision: 464121
URL: http://svn.apache.org/viewvc?view=rev&rev=464121
Log:
Clean build with Xerces pre 3.0 source
Modified:
xml/security/trunk/c/src/canon/XSECC14n20010315.cpp
xml/security/trunk/c/src/dsig/DSIGKeyInfoList.cpp
xml/security/trunk/c/src/dsig/DSIGReference.cpp
xml/security/trunk/c/src/transformers/TXFMEnvelope.cpp
xml/security/trunk/c/src/utils/XSECNameSpaceExpander.cpp
xml/security/trunk/c/src/xenc/impl/XENCCipherImpl.cpp
Modified: xml/security/trunk/c/src/canon/XSECC14n20010315.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/canon/XSECC14n20010315.cpp?view=diff&rev=464121&r1=464120&r2=464121
==============================================================================
--- xml/security/trunk/c/src/canon/XSECC14n20010315.cpp (original)
+++ xml/security/trunk/c/src/canon/XSECC14n20010315.cpp Sat Oct 14 22:15:59 2006
@@ -177,9 +177,9 @@
if (atts == NULL)
return false;
- int size = atts->getLength();
+ XMLSize_t size = atts->getLength();
- for (int i = 0; i < size; ++i) {
+ for (XMLSize_t i = 0; i < size; ++i) {
if (strEquals(atts->item(i)->getPrefix(), (char *) ns.rawBuffer()) &&
!strEquals(atts->item(i)->getLocalName(), "xmlns"))
@@ -291,7 +291,7 @@
stackInit(n->getParentNode());
m_nsStack.pushElement(n);
- int size;
+ XMLSize_t size;
DOMNamedNodeMap *tmpAtts = n->getAttributes();
safeBuffer currentName;
@@ -301,7 +301,7 @@
else
size = 0;
- int i;
+ XMLSize_t i;
for (i = 0; i < size; ++i) {
@@ -1101,7 +1101,7 @@
// Need to sort the attributes
- int size;
+ XMLSize_t size;
if (tmpAtts != NULL)
size = tmpAtts->getLength();
@@ -1109,7 +1109,7 @@
size = 0;
XSECNodeListElt *toIns;
- int i;
+ XMLSize_t i;
for (i = 0; i < size; ++i) {
@@ -1182,7 +1182,7 @@
t = mp_nextNode;
while (t != next) {
DOMNamedNodeMap *ta;
- int sz;
+ XMLSize_t sz;
ta = t->getAttributes();
@@ -1191,7 +1191,7 @@
else
sz = 0;
- for (int j = 0; j < sz; ++j) {
+ for (XMLSize_t j = 0; j < sz; ++j) {
if (strEquals(ta->item(j)->getNodeName(),
tmpAtts->item(i)->getNodeName()) == true) {
@@ -1384,7 +1384,7 @@
while (next != NULL && !m_useNamespaceStack && (m_XPathSelection && !m_XPathMap.hasNode(next)))
next = next->getParentNode();
- int size;
+ XMLSize_t size;
if (next != NULL)
tmpAtts = next->getAttributes();
@@ -1393,7 +1393,7 @@
else
size = 0;
- for (int i = 0; i < size; ++i) {
+ for (XMLSize_t i = 0; i < size; ++i) {
currentName << (*mp_formatter << tmpAtts->item(i)->getNodeName());
currentValue << (*mp_formatter << tmpAtts->item(i)->getNodeValue());
Modified: xml/security/trunk/c/src/dsig/DSIGKeyInfoList.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/dsig/DSIGKeyInfoList.cpp?view=diff&rev=464121&r1=464120&r2=464121
==============================================================================
--- xml/security/trunk/c/src/dsig/DSIGKeyInfoList.cpp (original)
+++ xml/security/trunk/c/src/dsig/DSIGKeyInfoList.cpp Sat Oct 14 22:15:59 2006
@@ -213,12 +213,12 @@
DOMNamedNodeMap *atts = tmpKI->getAttributes();
const XMLCh * name;
- unsigned int size;
+ XMLSize_t size;
if (atts == 0 || (size = atts->getLength()) == 0)
return true;
- for (unsigned int i = 0; i < size; ++i) {
+ for (XMLSize_t i = 0; i < size; ++i) {
name = atts->item(i)->getNodeName();
Modified: xml/security/trunk/c/src/dsig/DSIGReference.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/dsig/DSIGReference.cpp?view=diff&rev=464121&r1=464120&r2=464121
==============================================================================
--- xml/security/trunk/c/src/dsig/DSIGReference.cpp (original)
+++ xml/security/trunk/c/src/dsig/DSIGReference.cpp Sat Oct 14 22:15:59 2006
@@ -552,9 +552,9 @@
if (atts != 0) {
- unsigned int size = atts->getLength();
+ XMLSize_t size = atts->getLength();
- for (unsigned int i = 0; i < size; ++i) {
+ for (XMLSize_t i = 0; i < size; ++i) {
name = atts->item(i)->getNodeName();
sbName << (*mp_formatter << atts->item(i)->getNodeName());
Modified: xml/security/trunk/c/src/transformers/TXFMEnvelope.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/transformers/TXFMEnvelope.cpp?view=diff&rev=464121&r1=464120&r2=464121
==============================================================================
--- xml/security/trunk/c/src/transformers/TXFMEnvelope.cpp (original)
+++ xml/security/trunk/c/src/transformers/TXFMEnvelope.cpp Sat Oct 14 22:15:59 2006
@@ -120,7 +120,7 @@
DOMNode *tmp;
DOMNamedNodeMap *atts;
- int attsSize, i;
+ XMLSize_t attsSize, i;
if (startNode == sigNode)
return;
@@ -162,7 +162,7 @@
DOMNode *tmp;
DOMNamedNodeMap *atts;
- int attsSize, i;
+ XMLSize_t attsSize, i;
if (startNode == NULL)
return;
Modified: xml/security/trunk/c/src/utils/XSECNameSpaceExpander.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/utils/XSECNameSpaceExpander.cpp?view=diff&rev=464121&r1=464120&r2=464121
==============================================================================
--- xml/security/trunk/c/src/utils/XSECNameSpaceExpander.cpp (original)
+++ xml/security/trunk/c/src/utils/XSECNameSpaceExpander.cpp Sat Oct 14 22:15:59 2006
@@ -70,7 +70,7 @@
return;
DOMNamedNodeMap *pmap = p->getAttributes();
- int psize = pmap->getLength();
+ XMLSize_t psize = pmap->getLength();
DOMNamedNodeMap *nmap = n->getAttributes();
@@ -79,7 +79,7 @@
XSECNameSpaceEntry * tmpEnt;
- for (int i = 0; i < psize; i++) {
+ for (XMLSize_t i = 0; i < psize; i++) {
// Run through each parent node to find namespaces
pname << (*mp_formatter << pmap->item(i)->getNodeName());
@@ -126,7 +126,7 @@
int attNodeCount(DOMElement * d) {
- int ret;
+ XMLSize_t ret;
ret = d->getAttributes()->getLength();
@@ -143,7 +143,7 @@
}
- return ret;
+ return (int) ret;
}
Modified: xml/security/trunk/c/src/xenc/impl/XENCCipherImpl.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/xenc/impl/XENCCipherImpl.cpp?view=diff&rev=464121&r1=464120&r2=464121
==============================================================================
--- xml/security/trunk/c/src/xenc/impl/XENCCipherImpl.cpp (original)
+++ xml/security/trunk/c/src/xenc/impl/XENCCipherImpl.cpp Sat Oct 14 22:15:59 2006
@@ -245,13 +245,13 @@
while (wk != NULL) {
DOMNamedNodeMap * atts = wk->getAttributes();
- int length;
+ XMLSize_t length;
if (atts != NULL)
length = atts->getLength();
else
length = 0;
- for (int i = 0 ; i < length ; ++i) {
+ for (XMLSize_t i = 0 ; i < length ; ++i) {
DOMNode * att = atts->item(i);
if (strEquals(att->getNodeName(), DSIGConstants::s_unicodeStrXmlns) ||
(XMLString::compareNString(att->getNodeName(), DSIGConstants::s_unicodeStrXmlns, 5) &&