You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by jb...@apache.org on 2003/05/21 04:43:07 UTC
cvs commit: xml-xerces/c/src/xercesc/util/Transcoders/MacOSUnicodeConverter MacOSUnicodeConverter.hpp
jberry 2003/05/20 19:43:07
Modified: c/Projects/MacOS/ProjectBuilder/XercesLib/XercesLib.pbproj
project.pbxproj
c/src/xercesc/util/Platforms/MacOS MacOSPlatformUtils.cpp
MacOSPlatformUtils.hpp
c/src/xercesc/util/Transcoders/MacOSUnicodeConverter
MacOSUnicodeConverter.hpp
Log:
First cut at Mac OS X Project Builder changes
Revision Changes Path
1.36 +56 -0 xml-xerces/c/Projects/MacOS/ProjectBuilder/XercesLib/XercesLib.pbproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /home/cvs/xml-xerces/c/Projects/MacOS/ProjectBuilder/XercesLib/XercesLib.pbproj/project.pbxproj,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- project.pbxproj 27 Apr 2003 16:52:43 -0000 1.35
+++ project.pbxproj 21 May 2003 02:43:07 -0000 1.36
@@ -743,6 +743,8 @@
02058E87FF8AF8CD7F000001,
02058E88FF8AF8CD7F000001,
F51053550382BB2501A80066,
+ 90F9913A047B1E0100A80080,
+ 90F9913B047B1E0100A80080,
02058E89FF8AF8CD7F000001,
02058E8AFF8AF8CD7F000001,
02058E8BFF8AF8CD7F000001,
@@ -3426,6 +3428,8 @@
9019E702045C3C8C0095DDBE,
9019E706045C3CBB0095DDBE,
9019E70A045C3CE10095DDBE,
+ 90F9913D047B1E0100A80080,
+ 90F99141047B1E7800A80080,
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -3739,6 +3743,8 @@
90B1A25B041C20770095DDD1,
9019E705045C3CBB0095DDBE,
9019E709045C3CE10095DDBE,
+ 90F9913C047B1E0100A80080,
+ 90F99140047B1E7800A80080,
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
@@ -4833,6 +4839,54 @@
settings = {
};
};
+ 90F9913A047B1E0100A80080 = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = XMemory.cpp;
+ refType = 4;
+ };
+ 90F9913B047B1E0100A80080 = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = XMemory.hpp;
+ refType = 4;
+ };
+ 90F9913C047B1E0100A80080 = {
+ fileRef = 90F9913A047B1E0100A80080;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 90F9913D047B1E0100A80080 = {
+ fileRef = 90F9913B047B1E0100A80080;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 90F9913E047B1E7800A80080 = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = DOMNormalizer.cpp;
+ refType = 4;
+ };
+ 90F9913F047B1E7800A80080 = {
+ fileEncoding = 30;
+ isa = PBXFileReference;
+ path = DOMNormalizer.hpp;
+ refType = 4;
+ };
+ 90F99140047B1E7800A80080 = {
+ fileRef = 90F9913E047B1E7800A80080;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
+ 90F99141047B1E7800A80080 = {
+ fileRef = 90F9913F047B1E7800A80080;
+ isa = PBXBuildFile;
+ settings = {
+ };
+ };
//900
//901
//902
@@ -8370,6 +8424,8 @@
F58FFBAC02C4EAAC01A80065,
F58FFBAD02C4EAAC01A80065,
F58FFBAE02C4EAAC01A80065,
+ 90F9913E047B1E7800A80080,
+ 90F9913F047B1E7800A80080,
F58FFBAF02C4EAAC01A80065,
F58FFBB002C4EAAC01A80065,
F58FFBB102C4EAAC01A80065,
1.18 +44 -34 xml-xerces/c/src/xercesc/util/Platforms/MacOS/MacOSPlatformUtils.cpp
Index: MacOSPlatformUtils.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Platforms/MacOS/MacOSPlatformUtils.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- MacOSPlatformUtils.cpp 15 May 2003 18:37:48 -0000 1.17
+++ MacOSPlatformUtils.cpp 21 May 2003 02:43:07 -0000 1.18
@@ -126,13 +126,13 @@
XMLCh* ConvertSlashToColon(XMLCh* p, std::size_t charCount);
char* ConvertSlashToColon(char* p, std::size_t charCount);
-XMLCh* XMLCreateFullPathFromFSRef_X(const FSRef& startingRef);
-XMLCh* XMLCreateFullPathFromFSRef_Classic(const FSRef& startingRef);
+XMLCh* XMLCreateFullPathFromFSRef_X(const FSRef& startingRef, MemoryManager* const manager);
+XMLCh* XMLCreateFullPathFromFSRef_Classic(const FSRef& startingRef, MemoryManager* const manager);
XMLCh* XMLCreateFullPathFromFSSpec_Classic(const FSSpec& startingSpec,
MemoryManager* const manager);
-bool XMLParsePathToFSRef_X(const XMLCh* const pathName, FSRef& ref);
-bool XMLParsePathToFSRef_Classic(const XMLCh* const pathName, FSRef& ref);
-bool XMLParsePathToFSSpec_Classic(const XMLCh* const pathName, FSSpec& spec);
+bool XMLParsePathToFSRef_X(const XMLCh* const pathName, FSRef& ref, MemoryManager* const manager);
+bool XMLParsePathToFSRef_Classic(const XMLCh* const pathName, FSRef& ref, MemoryManager* const manager);
+bool XMLParsePathToFSSpec_Classic(const XMLCh* const pathName, FSSpec& spec, MemoryManager* const manager);
//----------------------------------------------------------------------------
@@ -313,13 +313,17 @@
if (gHasHFSPlusAPIs)
{
FSRef ref;
- if (!XMLParsePathToFSRef(srcPath, ref) || (path = XMLCreateFullPathFromFSRef(ref)) == NULL)
+ if ( !XMLParsePathToFSRef(srcPath, ref, manager)
+ || (path = XMLCreateFullPathFromFSRef(ref, manager)) == NULL
+ )
path = XMLString::replicate(srcPath, manager);
}
else
{
FSSpec spec;
- if (!XMLParsePathToFSSpec(srcPath, spec) || (path = XMLCreateFullPathFromFSSpec(spec, manager)) == NULL)
+ if ( !XMLParsePathToFSSpec(srcPath, spec, manager)
+ || (path = XMLCreateFullPathFromFSSpec(spec, manager)) == NULL
+ )
path = XMLString::replicate(srcPath, manager);
}
@@ -739,7 +743,7 @@
bool
-XMLParsePathToFSRef(const XMLCh* const pathName, FSRef& ref)
+XMLParsePathToFSRef(const XMLCh* const pathName, FSRef& ref, MemoryManager* const manager)
{
bool result;
@@ -759,16 +763,16 @@
// classic case for this.
if (TARGET_API_MAC_CARBON && gHasFSPathAPIs && gPathAPIsUsePosixPaths)
- result = XMLParsePathToFSRef_X(pathName, ref);
+ result = XMLParsePathToFSRef_X(pathName, ref, manager);
else
- result = XMLParsePathToFSRef_Classic(pathName, ref);
+ result = XMLParsePathToFSRef_Classic(pathName, ref, manager);
return result;
}
bool
-XMLParsePathToFSRef_X(const XMLCh* const pathName, FSRef& ref)
+XMLParsePathToFSRef_X(const XMLCh* const pathName, FSRef& ref, MemoryManager* const manager)
{
// Parse Path to FSRef using FSPathMakeRef as available under
// Mac OS X and CarbonLib 1.1 and greater.
@@ -828,7 +832,7 @@
bool
-XMLParsePathToFSRef_Classic(const XMLCh* const pathName, FSRef& ref)
+XMLParsePathToFSRef_Classic(const XMLCh* const pathName, FSRef& ref, MemoryManager* const manager)
{
// Parse Path to FSRef by stepping manually through path components.
@@ -960,7 +964,8 @@
bool
-XMLParsePathToFSSpec(const XMLCh* const pathName, FSSpec& spec)
+XMLParsePathToFSSpec(const XMLCh* const pathName, FSSpec& spec,
+ MemoryManager* const manager)
{
// Parse Path to an FSSpec
@@ -974,7 +979,7 @@
{
// Parse to a ref
FSRef ref;
- result = XMLParsePathToFSRef(pathName, ref);
+ result = XMLParsePathToFSRef(pathName, ref, manager);
// Down convert to a spec
if (result)
@@ -987,7 +992,7 @@
));
}
else
- result = XMLParsePathToFSSpec_Classic(pathName, spec);
+ result = XMLParsePathToFSSpec_Classic(pathName, spec, manager);
// Return true on success
return result;
@@ -995,13 +1000,14 @@
bool
-XMLParsePathToFSSpec_Classic(const XMLCh* const pathName, FSSpec& spec)
+XMLParsePathToFSSpec_Classic(const XMLCh* const pathName, FSSpec& spec,
+ MemoryManager* const manager)
{
// Manually parse the path using FSSpec APIs.
// Transcode the path into ascii
- const char* p = XMLString::transcode(pathName, fgMemoryManager);
- ArrayJanitor<const char> janPath(p, fgMemoryManager);
+ const char* p = XMLString::transcode(pathName, manager);
+ ArrayJanitor<const char> janPath(p, manager);
const char* pEnd;
std::size_t segLen;
@@ -1153,7 +1159,8 @@
XMLCh*
-XMLCreateFullPathFromFSRef(const FSRef& startingRef)
+XMLCreateFullPathFromFSRef(const FSRef& startingRef,
+ MemoryManager* const manager)
{
XMLCh* result = NULL;
@@ -1171,16 +1178,17 @@
// makes paths with ':' separators, which really confuses us!
if (TARGET_API_MAC_CARBON && gHasFSPathAPIs && gPathAPIsUsePosixPaths)
- result = XMLCreateFullPathFromFSRef_X(startingRef);
+ result = XMLCreateFullPathFromFSRef_X(startingRef, manager);
else
- result = XMLCreateFullPathFromFSRef_Classic(startingRef);
+ result = XMLCreateFullPathFromFSRef_Classic(startingRef, manager);
return result;
}
XMLCh*
-XMLCreateFullPathFromFSRef_X(const FSRef& startingRef)
+XMLCreateFullPathFromFSRef_X(const FSRef& startingRef,
+ MemoryManager* const manager)
{
// Create the path using FSRefMakePath as available on Mac OS X
// and under CarbonLib 1.1 and greater.
@@ -1203,7 +1211,8 @@
uniBuf[pathLen++] = 0;
// Transcode into a dynamically allocated buffer of XMLChs
- ArrayJanitor<XMLCh> result((XMLCh*) fgMemoryManager->allocate(pathLen * sizeof(XMLCh))/*new XMLCh[pathLen]*/, fgMemoryManager);
+ ArrayJanitor<XMLCh> result((XMLCh*) manager->allocate(pathLen * sizeof(XMLCh))/*new XMLCh[pathLen]*/,
+ manager);
if (result.get() != NULL)
CopyUniCharsToXMLChs(uniBuf, result.get(), pathLen, pathLen);
@@ -1212,7 +1221,8 @@
XMLCh*
-XMLCreateFullPathFromFSRef_Classic(const FSRef& startingRef)
+XMLCreateFullPathFromFSRef_Classic(const FSRef& startingRef,
+ MemoryManager* const manager)
{
// Manually create the path using FSRef APIs.
OSStatus err = noErr;
@@ -1249,8 +1259,8 @@
{
ArrayJanitor<XMLCh> temp
(
- (XMLCh*) fgMemoryManager->allocate((bufCnt + resultLen) * sizeof(XMLCh));//new XMLCh[bufCnt + resultLen]
- , fgMemoryManager
+ (XMLCh*) manager->allocate((bufCnt + resultLen) * sizeof(XMLCh)) //new XMLCh[bufCnt + resultLen]
+ , manager
);
// Copy in the static buffer
@@ -1281,8 +1291,8 @@
// Composite existing buffer + any previous result buffer
ArrayJanitor<XMLCh> final
(
- (XMLCh*) fgMemoryManager->allocate((bufCnt + resultLen) * sizeof(XMLCh))//new XMLCh[bufCnt + resultLen]
- , fgMemoryManager
+ (XMLCh*) manager->allocate((bufCnt + resultLen) * sizeof(XMLCh))//new XMLCh[bufCnt + resultLen]
+ , manager
);
// Copy in the static buffer
@@ -1316,7 +1326,7 @@
// Create the path
if (err == noErr)
- result = XMLCreateFullPathFromFSRef(ref);
+ result = XMLCreateFullPathFromFSRef(ref, manager);
}
else
{
@@ -1366,8 +1376,8 @@
{
ArrayJanitor<char> temp
(
- (char*) fgMemoryManager->allocate((bufCnt + resultLen) * sizeof(char))//new char[bufCnt + resultLen]
- , fgMemoryManager
+ (char*) manager->allocate((bufCnt + resultLen) * sizeof(char))//new char[bufCnt + resultLen]
+ , manager
);
// Copy in the static buffer
@@ -1402,8 +1412,8 @@
// Composite existing buffer with any previous result buffer
ArrayJanitor<char> final
(
- (char*) fgMemoryManager->allocate((bufCnt + resultLen) * sizeof(char))//new char[bufCnt + resultLen]
- , fgMemoryManager
+ (char*) manager->allocate((bufCnt + resultLen) * sizeof(char))//new char[bufCnt + resultLen]
+ , manager
);
// Copy in the static buffer
1.9 +9 -5 xml-xerces/c/src/xercesc/util/Platforms/MacOS/MacOSPlatformUtils.hpp
Index: MacOSPlatformUtils.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Platforms/MacOS/MacOSPlatformUtils.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MacOSPlatformUtils.hpp 27 Apr 2003 16:52:03 -0000 1.8
+++ MacOSPlatformUtils.hpp 21 May 2003 02:43:07 -0000 1.9
@@ -97,13 +97,17 @@
// Convert fom FSRef/FSSpec to a Unicode character string path.
// Note that you'll need to delete [] that string after you're done with it!
-XMLUTIL_EXPORT XMLCh* XMLCreateFullPathFromFSRef(const FSRef& startingRef);
-XMLUTIL_EXPORT XMLCh* XMLCreateFullPathFromFSSpec(const FSSpec& startingSpec);
+XMLUTIL_EXPORT XMLCh* XMLCreateFullPathFromFSRef(const FSRef& startingRef,
+ MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
+XMLUTIL_EXPORT XMLCh* XMLCreateFullPathFromFSSpec(const FSSpec& startingSpec,
+ MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
// Convert from path to FSRef/FSSpec
// You retain ownership of the pathName.
-XMLUTIL_EXPORT bool XMLParsePathToFSRef(const XMLCh* const pathName, FSRef& ref);
-XMLUTIL_EXPORT bool XMLParsePathToFSSpec(const XMLCh* const pathName, FSSpec& spec);
+XMLUTIL_EXPORT bool XMLParsePathToFSRef(const XMLCh* const pathName, FSRef& ref,
+ MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
+XMLUTIL_EXPORT bool XMLParsePathToFSSpec(const XMLCh* const pathName, FSSpec& spec,
+ MemoryManager* const manager = XMLPlatformUtils::fgMemoryManager);
// These routines copy characters between their representation in the Unicode Converter
// and the representation used by XMLCh. Until a recent change in Xerces, these were
1.9 +2 -2 xml-xerces/c/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp
Index: MacOSUnicodeConverter.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MacOSUnicodeConverter.hpp 17 May 2003 16:32:18 -0000 1.8
+++ MacOSUnicodeConverter.hpp 21 May 2003 02:43:07 -0000 1.9
@@ -259,7 +259,7 @@
MemoryManager* const manager);
virtual XMLCh* transcode(const char* const toTranscode);
- virtual char* transcode(const XMLCh* const toTranscode,
+ virtual XMLCh* transcode(const char* const toTranscode,
MemoryManager* const manager);
virtual bool transcode
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org