dbertoni 2003/12/28 16:39:33
Modified: c/src/xalanc/PlatformSupport XalanICUMessageLoader.cpp
XalanICUMessageLoader.hpp
Log:
Minor cleanup.
Revision Changes Path
1.5 +11 -28
xml-xalan/c/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp
Index: XalanICUMessageLoader.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XalanICUMessageLoader.cpp 29 Dec 2003 00:26:54 -0000 1.4
+++ XalanICUMessageLoader.cpp 29 Dec 2003 00:39:33 -0000 1.5
@@ -148,8 +148,8 @@
XalanICUMessageLoader::XalanICUMessageLoader():
- fLocaleBundle(0),
- fDomainBundle(0),
+ m_localeBundle(0),
+ m_domainBundle(0),
m_unknownMessage(XALAN_STATIC_UCODE_STRING("The message was not found
in the ICU resource bundle."))
{
UErrorCode err = U_ZERO_ERROR;
@@ -171,15 +171,15 @@
szLocal="en_US";
}
- fLocaleBundle = ures_open(sPackageName, szLocal , &err);
- if (!U_SUCCESS(err) || fLocaleBundle == 0)
+ m_localeBundle = ures_open(sPackageName, szLocal , &err);
+ if (!U_SUCCESS(err) || m_localeBundle == 0)
{
assert( 0 );
}
err = U_ZERO_ERROR;
- fDomainBundle = ures_getByKey(fLocaleBundle, domainName, 0, &err);
- if (!U_SUCCESS(err) || fDomainBundle == 0)
+ m_domainBundle = ures_getByKey(m_localeBundle, domainName, 0, &err);
+ if (!U_SUCCESS(err) || m_domainBundle == 0)
{
assert( 0 );
}
@@ -189,8 +189,8 @@
XalanICUMessageLoader::~XalanICUMessageLoader()
{
- ures_close(fDomainBundle);
- ures_close(fLocaleBundle);
+ ures_close(m_domainBundle);
+ ures_close(m_localeBundle);
}
@@ -206,7 +206,7 @@
int32_t strLen = 0;
// Assuming array format
- const UChar * const name = ures_getStringByIndex(fDomainBundle,
(int32_t)msgToLoad+1, &strLen, &err);
+ const UChar * const name = ures_getStringByIndex(m_domainBundle,
(int32_t)msgToLoad+1, &strLen, &err);
if (!U_SUCCESS(err) || (name == 0))
{
@@ -215,26 +215,9 @@
return false;
}
+ const unsigned int retStrLen = strLen > maxChars ? maxChars :
strLen;
- int retStrLen = strLen > (int32_t)maxChars ? maxChars : strLen;
-
- if (sizeof(UChar)==sizeof(XMLCh))
- {
-
- XMLString::moveChars(toFill, (const XMLCh*)name, retStrLen);
- toFill[retStrLen] = (XMLCh) 0;
- }
- else
- {
-
- XMLCh* retStr = toFill;
- const UChar *srcPtr = name;
-
- while (retStrLen--)
- *retStr++ = *srcPtr++;
-
- *retStr = 0;
- }
+ XalanCopy(name, name + retStrLen, toFill);
return bResult;
}
1.3 +2 -2
xml-xalan/c/src/xalanc/PlatformSupport/XalanICUMessageLoader.hpp
Index: XalanICUMessageLoader.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanICUMessageLoader.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanICUMessageLoader.hpp 29 Dec 2003 00:26:54 -0000 1.2
+++ XalanICUMessageLoader.hpp 29 Dec 2003 00:39:33 -0000 1.3
@@ -112,8 +112,8 @@
// locale specific resource bundle unavailable.
//
//
-----------------------------------------------------------------------
- UResourceBundle* fLocaleBundle;
- UResourceBundle* fDomainBundle;
+ UResourceBundle* m_localeBundle;
+ UResourceBundle* m_domainBundle;
const XalanDOMString m_unknownMessage;
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
