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/04/18 01:15:41 UTC
svn commit: r394807 - in /xml/security/trunk/c/src: canon/ dsig/
enc/XSCrypt/ transformers/ utils/ xenc/ xkms/
Author: blautenb
Date: Mon Apr 17 16:15:38 2006
New Revision: 394807
URL: http://svn.apache.org/viewcvs?rev=394807&view=rev
Log:
Cleanup for a no-warning Sun C++ 5.8 compile
Modified:
xml/security/trunk/c/src/canon/XSECCanon.hpp
xml/security/trunk/c/src/canon/XSECXMLNSStack.hpp
xml/security/trunk/c/src/dsig/DSIGConstants.hpp
xml/security/trunk/c/src/enc/XSCrypt/XSCryptCryptoBase64.hpp
xml/security/trunk/c/src/transformers/TXFMXPath.cpp
xml/security/trunk/c/src/transformers/TXFMXPath.hpp
xml/security/trunk/c/src/utils/XSECXPathNodeList.hpp
xml/security/trunk/c/src/xenc/XENCCipherData.hpp
xml/security/trunk/c/src/xkms/XKMSMessageAbstractType.hpp
Modified: xml/security/trunk/c/src/canon/XSECCanon.hpp
URL: http://svn.apache.org/viewcvs/xml/security/trunk/c/src/canon/XSECCanon.hpp?rev=394807&r1=394806&r2=394807&view=diff
==============================================================================
--- xml/security/trunk/c/src/canon/XSECCanon.hpp (original)
+++ xml/security/trunk/c/src/canon/XSECCanon.hpp Mon Apr 17 16:15:38 2006
@@ -29,8 +29,8 @@
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/utils/XSECSafeBuffer.hpp>
-XSEC_DECLARE_XERCES_CLASS(DOMNode);
-XSEC_DECLARE_XERCES_CLASS(DOMDocument);
+XSEC_DECLARE_XERCES_CLASS(DOMNode)
+XSEC_DECLARE_XERCES_CLASS(DOMDocument)
// --------------------------------------------------------------------------------
// Defines
Modified: xml/security/trunk/c/src/canon/XSECXMLNSStack.hpp
URL: http://svn.apache.org/viewcvs/xml/security/trunk/c/src/canon/XSECXMLNSStack.hpp?rev=394807&r1=394806&r2=394807&view=diff
==============================================================================
--- xml/security/trunk/c/src/canon/XSECXMLNSStack.hpp (original)
+++ xml/security/trunk/c/src/canon/XSECXMLNSStack.hpp Mon Apr 17 16:15:38 2006
@@ -31,7 +31,7 @@
// Xerces
-XSEC_DECLARE_XERCES_CLASS(DOMNode);
+XSEC_DECLARE_XERCES_CLASS(DOMNode)
// General
Modified: xml/security/trunk/c/src/dsig/DSIGConstants.hpp
URL: http://svn.apache.org/viewcvs/xml/security/trunk/c/src/dsig/DSIGConstants.hpp?rev=394807&r1=394806&r2=394807&view=diff
==============================================================================
--- xml/security/trunk/c/src/dsig/DSIGConstants.hpp (original)
+++ xml/security/trunk/c/src/dsig/DSIGConstants.hpp Mon Apr 17 16:15:38 2006
@@ -513,22 +513,18 @@
case (CANON_C14N_NOC) :
return DSIGConstants::s_unicodeStrURIC14N_NOC;
- break;
case (CANON_C14N_COM) :
return DSIGConstants::s_unicodeStrURIC14N_COM;
- break;
case (CANON_C14NE_NOC) :
return DSIGConstants::s_unicodeStrURIEXC_C14N_NOC;
- break;
case (CANON_C14NE_COM) :
return DSIGConstants::s_unicodeStrURIEXC_C14N_COM;
- break;
default :
break;
Modified: xml/security/trunk/c/src/enc/XSCrypt/XSCryptCryptoBase64.hpp
URL: http://svn.apache.org/viewcvs/xml/security/trunk/c/src/enc/XSCrypt/XSCryptCryptoBase64.hpp?rev=394807&r1=394806&r2=394807&view=diff
==============================================================================
--- xml/security/trunk/c/src/enc/XSCrypt/XSCryptCryptoBase64.hpp (original)
+++ xml/security/trunk/c/src/enc/XSCrypt/XSCryptCryptoBase64.hpp Mon Apr 17 16:15:38 2006
@@ -151,7 +151,7 @@
B64_UNINITIALISED,
B64_ENCODE,
- B64_DECODE,
+ B64_DECODE
};
safeBuffer m_inputBuffer; // Carry over buffer
Modified: xml/security/trunk/c/src/transformers/TXFMXPath.cpp
URL: http://svn.apache.org/viewcvs/xml/security/trunk/c/src/transformers/TXFMXPath.cpp?rev=394807&r1=394806&r2=394807&view=diff
==============================================================================
--- xml/security/trunk/c/src/transformers/TXFMXPath.cpp (original)
+++ xml/security/trunk/c/src/transformers/TXFMXPath.cpp Mon Apr 17 16:15:38 2006
@@ -275,7 +275,7 @@
-void TXFMXPath::evaluateExpr(DOMNode *h, safeBuffer expr) {
+void TXFMXPath::evaluateExpr(DOMNode *h, safeBuffer inexpr) {
// Temporarily add any necessary name spaces into the document
@@ -418,19 +418,19 @@
safeBuffer k(KLUDGE_PREFIX);
k.sbStrcatIn(":");
- offset = expr.sbStrstr("here()");
+ offset = inexpr.sbStrstr("here()");
while (offset >= 0) {
if (offset == 0 || offset == 1 ||
- (!(expr[offset - 1] == ':' && expr[offset - 2] != ':') &&
- separator(expr[offset - 1]))) {
+ (!(inexpr[offset - 1] == ':' && inexpr[offset - 2] != ':') &&
+ separator(inexpr[offset - 1]))) {
- expr.sbStrinsIn(k.rawCharBuffer(), offset);
+ inexpr.sbStrinsIn(k.rawCharBuffer(), offset);
}
- offset = expr.sbOffsetStrstr("here()", offset + 11);
+ offset = inexpr.sbOffsetStrstr("here()", offset + 11);
}
@@ -443,7 +443,7 @@
}
str.sbStrcpyIn("(descendant-or-self::node() | descendant-or-self::node()/attribute::* | descendant-or-self::node()/namespace::*)[");
- str.sbStrcatIn(expr);
+ str.sbStrcatIn(inexpr);
str.sbStrcatIn("]");
XPath * xp = xpf.create();
Modified: xml/security/trunk/c/src/transformers/TXFMXPath.hpp
URL: http://svn.apache.org/viewcvs/xml/security/trunk/c/src/transformers/TXFMXPath.hpp?rev=394807&r1=394806&r2=394807&view=diff
==============================================================================
--- xml/security/trunk/c/src/transformers/TXFMXPath.hpp (original)
+++ xml/security/trunk/c/src/transformers/TXFMXPath.hpp Mon Apr 17 16:15:38 2006
@@ -92,7 +92,7 @@
// XPath unique
void setNameSpace(XERCES_CPP_NAMESPACE_QUALIFIER DOMNamedNodeMap *xpAtts);
- void evaluateExpr(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *h, safeBuffer expr);
+ void evaluateExpr(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *h, safeBuffer inexpr);
void evaluateEnvelope(XERCES_CPP_NAMESPACE_QUALIFIER DOMNode *t);
// Methods to get output data
Modified: xml/security/trunk/c/src/utils/XSECXPathNodeList.hpp
URL: http://svn.apache.org/viewcvs/xml/security/trunk/c/src/utils/XSECXPathNodeList.hpp?rev=394807&r1=394806&r2=394807&view=diff
==============================================================================
--- xml/security/trunk/c/src/utils/XSECXPathNodeList.hpp (original)
+++ xml/security/trunk/c/src/utils/XSECXPathNodeList.hpp Mon Apr 17 16:15:38 2006
@@ -34,7 +34,7 @@
// Xerces
-XSEC_DECLARE_XERCES_CLASS(DOMNode);
+XSEC_DECLARE_XERCES_CLASS(DOMNode)
#define _XSEC_NODELIST_DEFAULT_SIZE 100
Modified: xml/security/trunk/c/src/xenc/XENCCipherData.hpp
URL: http://svn.apache.org/viewcvs/xml/security/trunk/c/src/xenc/XENCCipherData.hpp?rev=394807&r1=394806&r2=394807&view=diff
==============================================================================
--- xml/security/trunk/c/src/xenc/XENCCipherData.hpp (original)
+++ xml/security/trunk/c/src/xenc/XENCCipherData.hpp Mon Apr 17 16:15:38 2006
@@ -74,7 +74,7 @@
NO_TYPE = 0, /** Not Set */
VALUE_TYPE = 1,
- REFERENCE_TYPE = 2,
+ REFERENCE_TYPE = 2
};
Modified: xml/security/trunk/c/src/xkms/XKMSMessageAbstractType.hpp
URL: http://svn.apache.org/viewcvs/xml/security/trunk/c/src/xkms/XKMSMessageAbstractType.hpp?rev=394807&r1=394806&r2=394807&view=diff
==============================================================================
--- xml/security/trunk/c/src/xkms/XKMSMessageAbstractType.hpp (original)
+++ xml/security/trunk/c/src/xkms/XKMSMessageAbstractType.hpp Mon Apr 17 16:15:38 2006
@@ -118,7 +118,7 @@
RecoverRequest, /** A RecoverRequest message */
RecoverResult, /** A RecoverResult message */
ReissueRequest, /** A ReissueRequest message */
- ReissueResult, /** A ReissueResult message */
+ ReissueResult /** A ReissueResult message */
};