You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2005/05/20 00:22:24 UTC
cvs commit: xml-xalan/c/src/xalanc/XalanEXSLT XalanEXSLTString.cpp
dbertoni 2005/05/19 15:22:24
Modified: c/src/xalanc/XalanEXSLT XalanEXSLTString.cpp
Log:
Fixes for Jira issue XALANC-522.
Revision Changes Path
1.13 +17 -8 xml-xalan/c/src/xalanc/XalanEXSLT/XalanEXSLTString.cpp
Index: XalanEXSLTString.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XalanEXSLT/XalanEXSLTString.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XalanEXSLTString.cpp 29 Apr 2005 21:39:45 -0000 1.12
+++ XalanEXSLTString.cpp 19 May 2005 22:22:24 -0000 1.13
@@ -80,7 +80,10 @@
executionContext.error(getError(theBuffer), context, locator);
}
- assert(args[0].null() == false && args[1].null() == false && (theSize == 2 || args[2].null() == false));
+ assert(
+ args[0].null() == false &&
+ args[1].null() == false &&
+ (theSize == 2 || args[2].null() == false));
const XalanDOMString& theTargetString = args[0]->str();
const XalanDOMString& thePaddingString = args[1]->str();
@@ -239,7 +242,9 @@
executionContext.error(getError(theBuffer), context, locator);
}
- assert(args[0].null() == false && (theSize == 1 || args[1].null() == false));
+ assert(
+ args[0].null() == false &&
+ (theSize == 1 || args[1].null() == false));
const double theLength = DoubleSupport::round(args[0]->num());
const XalanDOMString& thePaddingString = theSize == 2 ? args[1]->str() : m_space;
@@ -345,15 +350,18 @@
executionContext.error(getError(theBuffer), context, locator);
}
- assert(args[0].null() == false &&
- args[1].null() == false &&
- (theSize == 3 || args[2].null() == false));
+ assert(
+ args[0].null() == false &&
+ args[1].null() == false &&
+ (theSize == 2 || args[2].null() == false));
const XalanDOMString& theString = args[0]->str();
const bool escapeReserved = args[1]->boolean();
// We only support UTF-8, which is the default when there are only two arguments.
- const bool fSupportedEncoding = theSize == 2 || XalanTranscodingServices::encodingIsUTF8(args[2]->str());
+ const bool fSupportedEncoding =
+ theSize == 2 ||
+ XalanTranscodingServices::encodingIsUTF8(args[2]->str());
if (theString.length() == 0 ||
!fSupportedEncoding)
@@ -474,8 +482,9 @@
executionContext.error(getError(theGuard.get()), context, locator);
}
- assert(args[0].null() == false &&
- (theSize == 2 || args[1].null() == false));
+ assert(
+ args[0].null() == false &&
+ (theSize == 1 || args[1].null() == false));
const XalanDOMString& theString = args[0]->str();
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org