You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by tn...@apache.org on 2002/05/21 22:35:33 UTC
cvs commit: xml-xerces/c/src/xercesc/util/Transcoders/Iconv400 Iconv400TransService.cpp
tng 02/05/21 13:35:33
Modified: c/src/xercesc/util/Transcoders/Iconv400
Iconv400TransService.cpp
Log:
Minor update: should use Xerces_DEBUG instead of XML4C_DEBUG
Revision Changes Path
1.4 +24 -24 xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp
Index: Iconv400TransService.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/Iconv400/Iconv400TransService.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Iconv400TransService.cpp 9 May 2002 19:05:19 -0000 1.3
+++ Iconv400TransService.cpp 21 May 2002 20:35:33 -0000 1.4
@@ -1,37 +1,37 @@
/*
* The Apache Software License, Version 1.1
- *
+ *
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
+ * notice, this list of conditions and the following disclaimer.
+ *
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
- *
+ *
* 3. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
+ * if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
- *
+ *
* 4. The names "Xerces" and "Apache Software Foundation" must
* not be used to endorse or promote products derived from this
- * software without prior written permission. For written
+ * software without prior written permission. For written
* permission, please contact apache\@apache.org.
- *
+ *
* 5. Products derived from this software may not be called "Apache",
* nor may "Apache" appear in their name, without prior written
* permission of the Apache Software Foundation.
- *
+ *
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -45,7 +45,7 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
- *
+ *
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation, and was
* originally based on software copyright (c) 1999, International
@@ -57,7 +57,7 @@
/**
* @01A D998714.1 V5R2M0 100301 Swan :Fix error return flags
* @02A V5R2M0 200419 jrhansen : support lowercase function
- * $Id: Iconv400TransService.cpp,v 1.3 2002/05/09 19:05:19 knoaman Exp $
+ * $Id: Iconv400TransService.cpp,v 1.4 2002/05/21 20:35:33 tng Exp $
*/
// ---------------------------------------------------------------------------
@@ -134,11 +134,11 @@
, const XMLCh* const comp2)
{
const XMLCh* psz1 = comp1;
- const XMLCh* psz2 = comp2;
+ const XMLCh* psz2 = comp2;
while (true)
{
-
+
if (toUnicodeUpper(*psz1) != toUnicodeUpper(*psz2))
return int(*psz1) - int(*psz2);
@@ -160,13 +160,13 @@
{
const XMLCh* psz1 = comp1;
const XMLCh* psz2 = comp2;
-
+
unsigned int curCount = 0;
while (true)
{
// If an inequality, then return the difference
-
+
// If an inequality, then return difference
if (toUnicodeUpper(*psz1) != toUnicodeUpper(*psz2))
@@ -181,7 +181,7 @@
psz2++;
//
- // Bump the count of chars done. If it equals the count then we
+ // Bump the count of chars done. If it equals the count then we
// are equal for the requested count, so break out and return
// equal.
//
@@ -264,7 +264,7 @@
// ---------------------------------------------------------------------------
// Iconv400TransService: The virtual transcoding service API
// ---------------------------------------------------------------------------
-XMLCh Iconv400TransService::toUnicodeUpper(XMLCh comp1) const
+XMLCh Iconv400TransService::toUnicodeUpper(XMLCh comp1) const
{
XMLCh chRet;
struct {
@@ -275,7 +275,7 @@
char exception_data[15];
} error_code;
error_code.bytes_available = sizeof(error_code);
-
+
long charlen =2;
QlgConvertCase((char*)&convertCtlblkUpper,
@@ -297,7 +297,7 @@
char exception_data[15];
} error_code;
error_code.bytes_available = sizeof(error_code);
-
+
long charlen =2;
QlgConvertCase((char*)&convertCtlblkLower,
@@ -401,7 +401,7 @@
, unsigned char* const charSizes)
{
// If debugging, insure the block size is legal
- #if defined(XML4C_DEBUG)
+ #if defined(Xerces_DEBUG)
checkBlockSize(maxChars);
#endif
@@ -717,7 +717,7 @@
char* startTarget = tmpBuf;
const UChar* startSrc = srcBuf;
UErrorCode err = U_ZERO_ERROR;
-
+
ucnv_fromUnicode
(
fConverter
@@ -730,7 +730,7 @@
, &err
);
-
+
return (err==U_ZERO_ERROR); /*@01A*/
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org