santuario-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blaut...@apache.org
Subject cvs commit: xml-security/c/src/utils XSECDOMUtils.cpp XSECDOMUtils.hpp
Date Sat, 07 Jun 2003 10:33:30 GMT
blautenb    2003/06/07 03:33:30

  Modified:    c/src    configure configure.ac
               c/src/dsig DSIGKeyInfoValue.hpp DSIGReference.cpp
                        DSIGReference.hpp DSIGTransformC14n.cpp
                        DSIGXPathHere.hpp
               c/src/enc XSECCryptoException.cpp XSECCryptoException.hpp
                        XSECCryptoKey.hpp XSECCryptoProvider.hpp
               c/src/enc/OpenSSL OpenSSLCryptoHashHMAC.cpp
               c/src/framework XSECError.cpp XSECError.hpp
               c/src/transformers TXFMSB.cpp TXFMSB.hpp TXFMURL.cpp
                        TXFMURL.hpp TXFMXPathFilter.cpp TXFMXSL.cpp
                        TXFMXSL.hpp
               c/src/utils XSECDOMUtils.cpp XSECDOMUtils.hpp
  Log:
  Fixed Forte 5.0 warnings and compile problems
  
  Revision  Changes    Path
  1.15      +4 -4      xml-security/c/src/configure
  
  Index: configure
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/configure,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- configure	5 Jun 2003 11:52:34 -0000	1.14
  +++ configure	7 Jun 2003 10:33:28 -0000	1.15
  @@ -3492,13 +3492,13 @@
   						else
   							# Not sure if these will work - only tested with g++
   							PIC="-KPIC"
  -							PLATFORM_OPTIONS="-mt -ks"
  +							PLATFORM_OPTIONS="-mt"
   						fi
   						# Should use -D_REENTRANT - but not yet OK
   						PLATFORM_OPTIONS="${PLATFORM_OPTIONS} ${PIC} -DSOLARIS"
   						CC1="${CXX} ${CXXFLAGS} ${PLATFORM_OPTIONS}"
   						CC4="${CC} ${CXXFLAGS} ${PLATFORM_OPTIONS}"
  -						MAKE_SHARED="${CXX} ${CXXFLAGS} -DSOLARIS -shared ${PIC}"
  +						MAKE_SHARED="${CXX} ${CXXFLAGS} -DSOLARIS -G ${PIC}"
   						LINK="${CXX} ${CXXFLAGS} -DSOLARIS ${PIC}"
   						LINK_COMMAND_1="(cd \$(LIB_DIR) ; rm -f \$(LIBMAJORNAME) ; \$(LN_S) \$(LIBNAME) \$(LIBMAJORNAME))"
   						LINK_COMMAND_2="(cd \$(LIB_DIR) ; rm -f \$(LIBSHORTNAME) ; \$(LN_S) \$(LIBNAME) \$(LIBSHORTNAME))"
  @@ -3808,7 +3808,7 @@
       cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
   #include "confdefs.h"
  -#include <Include/PlatformDefinitions.hpp>
  +#include <Include/XalanVersion.hpp>
   _ACEOF
   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
     (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
  @@ -3849,7 +3849,7 @@
       cat >conftest.$ac_ext <<_ACEOF
   #line $LINENO "configure"
   #include "confdefs.h"
  -#include <Include/PlatformDefinitions.hpp>
  +#include <Include/XalanVersion.hpp>
   _ACEOF
   if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
     (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
  
  
  
  1.15      +4 -4      xml-security/c/src/configure.ac
  
  Index: configure.ac
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/configure.ac,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- configure.ac	5 Jun 2003 11:52:35 -0000	1.14
  +++ configure.ac	7 Jun 2003 10:33:28 -0000	1.15
  @@ -180,13 +180,13 @@
   						else
   							# Not sure if these will work - only tested with g++
   							PIC=["-KPIC"]
  -							PLATFORM_OPTIONS=["-mt -ks"]
  +							PLATFORM_OPTIONS=["-mt"]
   						fi
   						# Should use -D_REENTRANT - but not yet OK
   						PLATFORM_OPTIONS=["${PLATFORM_OPTIONS} ${PIC} -DSOLARIS"]
   						CC1=["${CXX} ${CXXFLAGS} ${PLATFORM_OPTIONS}"]
   						CC4=["${CC} ${CXXFLAGS} ${PLATFORM_OPTIONS}"]
  -						MAKE_SHARED=["${CXX} ${CXXFLAGS} -DSOLARIS -shared ${PIC}"]
  +						MAKE_SHARED=["${CXX} ${CXXFLAGS} -DSOLARIS -G ${PIC}"]
   						LINK=["${CXX} ${CXXFLAGS} -DSOLARIS ${PIC}"]
   						LINK_COMMAND_1=["(cd \$(LIB_DIR) ; rm -f \$(LIBMAJORNAME) ; \$(LN_S) \$(LIBNAME)
\$(LIBMAJORNAME))"]
   						LINK_COMMAND_2=["(cd \$(LIB_DIR) ; rm -f \$(LIBSHORTNAME) ; \$(LN_S) \$(LIBNAME)
\$(LIBSHORTNAME))"]
  @@ -383,7 +383,7 @@
       OLD_CPPFLAGS=$CPPFLAGS
       CPPFLAGS=["${CPPFLAGS} -I${XALANCROOT}/src"]
   
  -    AC_TRY_CPP([#include <Include/PlatformDefinitions.hpp>], 
  +    AC_TRY_CPP([#include <Include/XalanVersion.hpp>], 
         xalan_found=yes 
         LIBS="${LIBS} -L${XALANCROOT}/lib -lxalan-c1_5_0"
         [AC_MSG_RESULT([found])], 
  @@ -395,7 +395,7 @@
     if test -z $xalan_found ; then
   
       AC_MSG_CHECKING([for Xalan in system includes])
  -    AC_TRY_CPP([#include <Include/PlatformDefinitions.hpp>], 
  +    AC_TRY_CPP([#include <Include/XalanVersion.hpp>], 
         xalan_found=yes 
         LIBS="${LIBS} -lxalan-c1_5_0"
         [AC_MSG_RESULT([found])],
  
  
  
  1.4       +2 -2      xml-security/c/src/dsig/DSIGKeyInfoValue.hpp
  
  Index: DSIGKeyInfoValue.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/dsig/DSIGKeyInfoValue.hpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DSIGKeyInfoValue.hpp	22 May 2003 11:17:40 -0000	1.3
  +++ DSIGKeyInfoValue.hpp	7 Jun 2003 10:33:28 -0000	1.4
  @@ -269,7 +269,7 @@
   	 * @param modulus Base64 encoded value of Modulus to set
   	 * @param exponent Base64 encoded value of the Exponent to set
   	 * @returns The DOM structure of the RSAValue that has been created
  -	 */;
  +	 */
   	
   	DOMElement * DSIGKeyInfoValue::createBlankRSAKeyValue(const XMLCh * modulus,
   		const XMLCh * exponent);
  
  
  
  1.11      +2 -2      xml-security/c/src/dsig/DSIGReference.cpp
  
  Index: DSIGReference.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/dsig/DSIGReference.cpp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DSIGReference.cpp	10 May 2003 07:23:36 -0000	1.10
  +++ DSIGReference.cpp	7 Jun 2003 10:33:28 -0000	1.11
  @@ -306,7 +306,7 @@
   
   }	
   
  -DSIGTransformXPath * DSIGReference::appendXPathTransform(char * expr) {
  +DSIGTransformXPath * DSIGReference::appendXPathTransform(const char * expr) {
   
   	DOMElement *txfmElt;
   	DSIGTransformXPath * txfm;
  
  
  
  1.8       +1 -1      xml-security/c/src/dsig/DSIGReference.hpp
  
  Index: DSIGReference.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/dsig/DSIGReference.hpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DSIGReference.hpp	10 May 2003 07:23:36 -0000	1.7
  +++ DSIGReference.hpp	7 Jun 2003 10:33:28 -0000	1.8
  @@ -230,7 +230,7 @@
   	 * @returns The newly created XPath transform
   	 */
   
  -	DSIGTransformXPath * appendXPathTransform(char * expr);
  +	DSIGTransformXPath * appendXPathTransform(const char * expr);
   	
   	/**
   	 * \brief Append an XPath-Filter2 Transform to the Reference.
  
  
  
  1.11      +8 -6      xml-security/c/src/dsig/DSIGTransformC14n.cpp
  
  Index: DSIGTransformC14n.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/dsig/DSIGTransformC14n.cpp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DSIGTransformC14n.cpp	1 Jun 2003 12:20:08 -0000	1.10
  +++ DSIGTransformC14n.cpp	7 Jun 2003 10:33:28 -0000	1.11
  @@ -229,13 +229,15 @@
   
   		// Exclusive, so there may be an InclusiveNamespaces node
   
  -		DOMNode *mp_inclNSNode = mp_txfmNode->getFirstChild();
  +		DOMNode * inclNSNode = mp_txfmNode->getFirstChild();
   		
  -		while (mp_inclNSNode != NULL && (mp_inclNSNode->getNodeType() != DOMNode::ELEMENT_NODE
||
  -			!strEquals(getECLocalName(mp_inclNSNode), "InclusiveNamespaces")))
  -				mp_inclNSNode = mp_inclNSNode->getNextSibling();
  +		while (inclNSNode != NULL && (inclNSNode->getNodeType() != DOMNode::ELEMENT_NODE
||
  +			!strEquals(getECLocalName(inclNSNode), "InclusiveNamespaces")))
  +				inclNSNode = inclNSNode->getNextSibling();
   
  -		if (mp_inclNSNode != 0) {
  +		if (inclNSNode != 0) {
  +
  +			mp_inclNSNode = static_cast<DOMElement *>(inclNSNode);
   
   			// Have a prefix list
   			atts = mp_inclNSNode->getAttributes();
  
  
  
  1.3       +7 -1      xml-security/c/src/dsig/DSIGXPathHere.hpp
  
  Index: DSIGXPathHere.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/dsig/DSIGXPathHere.hpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DSIGXPathHere.hpp	9 Feb 2003 11:13:48 -0000	1.2
  +++ DSIGXPathHere.hpp	7 Jun 2003 10:33:28 -0000	1.3
  @@ -112,6 +112,8 @@
   
   public:
   
  +	typedef Function	ParentType;
  +
   	DSIGXPathHere();
   	DSIGXPathHere(XalanNode *here);
   
  @@ -125,7 +127,11 @@
   			XPathExecutionContext&	executionContext,
   			XalanNode*				context,
   			//const XObjectPtr		arg1,
  -			const Locator*			locator) const;
  +			const LocatorType*		locator) const;
  +
  +#if !defined(XALAN_NO_USING_DECLARATION)
  +	using ParentType::execute;
  +#endif
   
   #if defined(XSEC_NO_COVARIANT_RETURN_TYPE)
   	virtual Function*
  
  
  
  1.4       +2 -4      xml-security/c/src/enc/XSECCryptoException.cpp
  
  Index: XSECCryptoException.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/enc/XSECCryptoException.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XSECCryptoException.cpp	7 Apr 2003 12:27:13 -0000	1.3
  +++ XSECCryptoException.cpp	7 Jun 2003 10:33:28 -0000	1.4
  @@ -64,9 +64,7 @@
    *
    * Author(s): Berin Lautenbach
    *
  - * $ID$
  - *
  - * $LOG$
  + * $Id$
    *
    */
   
  @@ -88,7 +86,7 @@
   
   };
   
  -XSECCryptoException::XSECCryptoException(XSECCryptoExceptionType eNum, char * inMsg) {
  +XSECCryptoException::XSECCryptoException(XSECCryptoExceptionType eNum, const char * inMsg)
{
   
   	if (eNum > UnknownError)
   		type = UnknownError;
  
  
  
  1.5       +2 -2      xml-security/c/src/enc/XSECCryptoException.hpp
  
  Index: XSECCryptoException.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/enc/XSECCryptoException.hpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XSECCryptoException.hpp	7 Apr 2003 12:27:13 -0000	1.4
  +++ XSECCryptoException.hpp	7 Jun 2003 10:33:28 -0000	1.5
  @@ -150,7 +150,7 @@
   	 * XSECCryptoExceptionStrings
   	 */
   
  -	XSECCryptoException(XSECCryptoExceptionType eNum, char * inMsg = NULL);
  +	XSECCryptoException(XSECCryptoExceptionType eNum, const char * inMsg = NULL);
   
   	/**
   	 * \brief safeBuffer constructor
  
  
  
  1.7       +2 -2      xml-security/c/src/enc/XSECCryptoKey.hpp
  
  Index: XSECCryptoKey.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/enc/XSECCryptoKey.hpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XSECCryptoKey.hpp	31 May 2003 22:51:29 -0000	1.6
  +++ XSECCryptoKey.hpp	7 Jun 2003 10:33:28 -0000	1.7
  @@ -113,7 +113,7 @@
   		KEY_RSA_PUBLIC,
   		KEY_RSA_PRIVATE,
   		KEY_RSA_PAIR,
  -		KEY_HMAC,
  +		KEY_HMAC
   	
   	};
   
  
  
  
  1.7       +2 -2      xml-security/c/src/enc/XSECCryptoProvider.hpp
  
  Index: XSECCryptoProvider.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/enc/XSECCryptoProvider.hpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XSECCryptoProvider.hpp	31 May 2003 22:51:29 -0000	1.6
  +++ XSECCryptoProvider.hpp	7 Jun 2003 10:33:28 -0000	1.7
  @@ -191,7 +191,7 @@
   		KEY_NONE			= 0,        /**< Key is empty - type unknown */
   		KEY_DSA_PUB			= 1,		/**< DSA key - Public part only */
   		KEY_DSA_PRIV		= 2,		/**< DSA key - Private part only */
  -		KEY_DSA_PAIR		= 3,		/**< DSA key - Full Key Pair */
  +		KEY_DSA_PAIR		= 3		/**< DSA key - Full Key Pair */
   
   	};
   
  @@ -203,7 +203,7 @@
   	enum CryptoAlgorithmType {
   
   		ALG_NONE			= 0,       /**< Used for catching errors */
  -		ALG_DSA				= 1,       /**< Digital Signature Algorithm */
  +		ALG_DSA				= 1        /**< Digital Signature Algorithm */
   
   	};
   
  
  
  
  1.5       +2 -2      xml-security/c/src/enc/OpenSSL/OpenSSLCryptoHashHMAC.cpp
  
  Index: OpenSSLCryptoHashHMAC.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoHashHMAC.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- OpenSSLCryptoHashHMAC.cpp	11 Apr 2003 12:26:26 -0000	1.4
  +++ OpenSSLCryptoHashHMAC.cpp	7 Jun 2003 10:33:29 -0000	1.5
  @@ -124,7 +124,7 @@
   
   	}
   
  -	unsigned int m_keyLen = ((XSECCryptoKeyHMAC *) key)->getKey(m_keyBuf);
  +	m_keyLen = ((XSECCryptoKeyHMAC *) key)->getKey(m_keyBuf);
   
   
   	HMAC_Init(&m_hctx, 
  
  
  
  1.5       +1 -1      xml-security/c/src/framework/XSECError.cpp
  
  Index: XSECError.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/framework/XSECError.cpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XSECError.cpp	22 May 2003 11:17:41 -0000	1.4
  +++ XSECError.cpp	7 Jun 2003 10:33:29 -0000	1.5
  @@ -74,7 +74,7 @@
   #include <xsec/framework/XSECDefs.hpp>
   // Real definition of strings
   
  -char * XSECExceptionStrings [] = {
  +const char * XSECExceptionStrings [] = {
   
   	"No Error",
   	"Error allocating memory",
  
  
  
  1.5       +2 -2      xml-security/c/src/framework/XSECError.hpp
  
  Index: XSECError.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/framework/XSECError.hpp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XSECError.hpp	2 Mar 2003 08:21:01 -0000	1.4
  +++ XSECError.hpp	7 Jun 2003 10:33:29 -0000	1.5
  @@ -85,7 +85,7 @@
    * an exception number.
    */
   
  -extern char * XSECExceptionStrings [];
  +extern const char * XSECExceptionStrings [];
   
   /** @} */
   
  
  
  
  1.4       +1 -1      xml-security/c/src/transformers/TXFMSB.cpp
  
  Index: TXFMSB.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMSB.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TXFMSB.cpp	22 Feb 2003 08:47:24 -0000	1.3
  +++ TXFMSB.cpp	7 Jun 2003 10:33:29 -0000	1.4
  @@ -89,7 +89,7 @@
   
   	// Methods to set the inputs
   
  -void TXFMSB::setInput(TXFMBase *input) {
  +void TXFMSB::setInput(TXFMBase *newInput) {
   
   	// Not possible as this needs to be the start of a tranform pipe
   
  
  
  
  1.6       +2 -2      xml-security/c/src/transformers/TXFMSB.hpp
  
  Index: TXFMSB.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMSB.hpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TXFMSB.hpp	2 Mar 2003 08:21:02 -0000	1.5
  +++ TXFMSB.hpp	7 Jun 2003 10:33:29 -0000	1.6
  @@ -91,7 +91,7 @@
   
   	// Methods to set the inputs
   
  -	virtual void setInput(TXFMBase *input);
  +	virtual void setInput(TXFMBase *newInput);
   	void setInput(const safeBuffer sbIn);
   	void setInput(const safeBuffer sbIn, unsigned int sbSize); 
   
  
  
  
  1.4       +1 -1      xml-security/c/src/transformers/TXFMURL.cpp
  
  Index: TXFMURL.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMURL.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TXFMURL.cpp	22 Feb 2003 08:47:24 -0000	1.3
  +++ TXFMURL.cpp	7 Jun 2003 10:33:29 -0000	1.4
  @@ -101,7 +101,7 @@
   
   	// Methods to set the inputs
   
  -void TXFMURL::setInput(TXFMBase *input) {
  +void TXFMURL::setInput(TXFMBase *newInput) {
   
   	// Not possible as this needs to be the start of a tranform pipe
   
  
  
  
  1.6       +2 -2      xml-security/c/src/transformers/TXFMURL.hpp
  
  Index: TXFMURL.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMURL.hpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TXFMURL.hpp	2 Mar 2003 08:21:02 -0000	1.5
  +++ TXFMURL.hpp	7 Jun 2003 10:33:29 -0000	1.6
  @@ -97,7 +97,7 @@
   
   	// Methods to set the inputs
   
  -	virtual void setInput(TXFMBase *input);
  +	virtual void setInput(TXFMBase *newInput);
   	void setInput(const XMLCh * URL);
   
   	// Methods to get tranform output type and input requirement
  
  
  
  1.4       +2 -2      xml-security/c/src/transformers/TXFMXPathFilter.cpp
  
  Index: TXFMXPathFilter.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMXPathFilter.cpp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TXFMXPathFilter.cpp	9 May 2003 12:07:59 -0000	1.3
  +++ TXFMXPathFilter.cpp	7 Jun 2003 10:33:29 -0000	1.4
  @@ -444,7 +444,7 @@
   
   	DOMNode * current = n;
   	DOMNode * next;
  -	DOMNode * attParent;
  +	DOMNode * attParent = NULL; 	/* Assign NULL to remove spurious Forte warning */
   	bool done = false;
   	bool treeUp = false;
   	DOMNamedNodeMap * atts = n->getAttributes();
  
  
  
  1.6       +3 -1      xml-security/c/src/transformers/TXFMXSL.cpp
  
  Index: TXFMXSL.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMXSL.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TXFMXSL.cpp	1 Mar 2003 06:27:29 -0000	1.5
  +++ TXFMXSL.cpp	7 Jun 2003 10:33:29 -0000	1.6
  @@ -93,6 +93,7 @@
   XALAN_USING_XALAN(XSLTResultTarget)
   
   // Function used to output data to a safeBuffer
  +extern "C" {
   
   typedef struct TransformXSLOutputHolderStruct {
   
  @@ -111,6 +112,7 @@
   
   	return sz;
   
  +}
   }
   
   // -----------------------------------------------------------------------
  
  
  
  1.6       +1 -4      xml-security/c/src/transformers/TXFMXSL.hpp
  
  Index: TXFMXSL.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/transformers/TXFMXSL.hpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TXFMXSL.hpp	2 Mar 2003 08:21:02 -0000	1.5
  +++ TXFMXSL.hpp	7 Jun 2003 10:33:29 -0000	1.6
  @@ -114,9 +114,6 @@
   
   	safeBuffer			sbInDoc;
   
  -	// The actual transformer elements
  -	XalanTransformer xt;
  -	
   	DOMDocument		* document;
   	
   	DOMDocument		* docOut;			// The output from the transformation
  
  
  
  1.8       +3 -3      xml-security/c/src/utils/XSECDOMUtils.cpp
  
  Index: XSECDOMUtils.cpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/utils/XSECDOMUtils.cpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- XSECDOMUtils.cpp	22 May 2003 11:17:41 -0000	1.7
  +++ XSECDOMUtils.cpp	7 Jun 2003 10:33:29 -0000	1.8
  @@ -118,7 +118,7 @@
   //           Find a nominated DSIG node in a document
   // --------------------------------------------------------------------------------
   
  -DOMNode *findDSIGNode(DOMNode *n, char * nodeName) {
  +DOMNode *findDSIGNode(DOMNode *n, const char * nodeName) {
   
   	const XMLCh * name = getDSIGLocalName(n);
   
  @@ -167,7 +167,7 @@
   //           Make a QName
   // --------------------------------------------------------------------------------
   
  -safeBuffer &makeQName(safeBuffer & qname, safeBuffer &prefix, char * localName)
{
  +safeBuffer &makeQName(safeBuffer & qname, safeBuffer &prefix, const char *
localName) {
   
   	if (prefix[0] == '\0') {
   		qname = localName;
  @@ -181,7 +181,7 @@
   	return qname;
   
   }
  -safeBuffer &makeQName(safeBuffer & qname, const XMLCh *prefix, char * localName)
{
  +safeBuffer &makeQName(safeBuffer & qname, const XMLCh *prefix, const char * localName)
{
   
   	if (prefix == NULL || prefix[0] == 0) {
   		qname.sbTranscodeIn(localName);
  
  
  
  1.8       +4 -4      xml-security/c/src/utils/XSECDOMUtils.hpp
  
  Index: XSECDOMUtils.hpp
  ===================================================================
  RCS file: /home/cvs/xml-security/c/src/utils/XSECDOMUtils.hpp,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- XSECDOMUtils.hpp	22 May 2003 11:17:41 -0000	1.7
  +++ XSECDOMUtils.hpp	7 Jun 2003 10:33:29 -0000	1.8
  @@ -122,7 +122,7 @@
   //           Find a nominated DSIG node in a document
   // --------------------------------------------------------------------------------
   
  -DOMNode DSIG_EXPORT * findDSIGNode(DOMNode *n, char * nodeName);
  +DOMNode DSIG_EXPORT * findDSIGNode(DOMNode *n, const char * nodeName);
   
   // --------------------------------------------------------------------------------
   //           Find particular type of node child
  @@ -134,8 +134,8 @@
   //           Make a QName
   // --------------------------------------------------------------------------------
   
  -safeBuffer DSIG_EXPORT &makeQName(safeBuffer & qname, safeBuffer &prefix, char
* localName);
  -safeBuffer DSIG_EXPORT &makeQName(safeBuffer & qname, const XMLCh *prefix, char
* localName);
  +safeBuffer DSIG_EXPORT &makeQName(safeBuffer & qname, safeBuffer &prefix, const
char * localName);
  +safeBuffer DSIG_EXPORT &makeQName(safeBuffer & qname, const XMLCh *prefix, const
char * localName);
   
   // --------------------------------------------------------------------------------
   //           Gather text from children
  
  
  

Mime
View raw message