From 08437a81587761cd2dd31d411534b4392330e7ed Mon Sep 17 00:00:00 2001 From: James David Berry <jberry@apache.org> Date: Thu, 21 Sep 2000 18:03:50 +0000 Subject: [PATCH] Change a couple of routine names to make them more orthagonal. git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@172404 13f79535-47bb-0310-9956-ffa450edef68 --- src/util/Platforms/MacOS/MacOSPlatformUtils.cpp | 11 +++++++---- src/util/Platforms/MacOS/MacOSPlatformUtils.hpp | 7 +++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/util/Platforms/MacOS/MacOSPlatformUtils.cpp b/src/util/Platforms/MacOS/MacOSPlatformUtils.cpp index 34d98e9e9..8f55d3fb5 100644 --- a/src/util/Platforms/MacOS/MacOSPlatformUtils.cpp +++ b/src/util/Platforms/MacOS/MacOSPlatformUtils.cpp @@ -56,6 +56,9 @@ /* * $Log$ + * Revision 1.13 2000/09/21 18:03:50 jberry + * Change a couple of routine names to make them more orthagonal. + * * Revision 1.12 2000/09/06 23:51:21 jberry * Add support for new compile time options defined in prefix file. These * control the selection of the msgloader, transcoder, and netaccessor. @@ -470,13 +473,13 @@ XMLCh* XMLPlatformUtils::getFullPath(const XMLCh* const srcPath) if (gHasHFSPlusAPIs) { FSRef ref; - if (!XMLParsePathToFSRef(srcPath, ref) || (path = XMLCreateFullPathFromRef(ref)) == NULL) + if (!XMLParsePathToFSRef(srcPath, ref) || (path = XMLCreateFullPathFromFSRef(ref)) == NULL) path = XMLString::replicate(srcPath); } else { FSSpec spec; - if (!XMLParsePathToFSSpec(srcPath, spec) || (path = XMLCreateFullPathFromSpec(spec)) == NULL) + if (!XMLParsePathToFSSpec(srcPath, spec) || (path = XMLCreateFullPathFromFSSpec(spec)) == NULL) path = XMLString::replicate(srcPath); } @@ -1087,7 +1090,7 @@ XMLParsePathToFSSpec(const XMLCh* const pathName, FSSpec& spec) XMLCh* -XMLCreateFullPathFromRef(const FSRef& startingRef) +XMLCreateFullPathFromFSRef(const FSRef& startingRef) { OSErr err = noErr; FSCatalogInfo catalogInfo; @@ -1174,7 +1177,7 @@ XMLCreateFullPathFromRef(const FSRef& startingRef) XMLCh* -XMLCreateFullPathFromSpec(const FSSpec& startingSpec) +XMLCreateFullPathFromFSSpec(const FSSpec& startingSpec) { OSErr err = noErr; FSSpec spec = startingSpec; diff --git a/src/util/Platforms/MacOS/MacOSPlatformUtils.hpp b/src/util/Platforms/MacOS/MacOSPlatformUtils.hpp index 73a9639c6..71f821c37 100644 --- a/src/util/Platforms/MacOS/MacOSPlatformUtils.hpp +++ b/src/util/Platforms/MacOS/MacOSPlatformUtils.hpp @@ -56,6 +56,9 @@ /* * $Log$ + * Revision 1.2 2000/09/21 18:03:50 jberry + * Change a couple of routine names to make them more orthagonal. + * * Revision 1.1 2000/07/18 18:26:11 andyh * Mac OS update. * Contributed by James Berry <jberry@criticalpath.com> @@ -104,8 +107,8 @@ class XMLMacFile : public XMLMacAbstractFile // 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! -XMLCh* XMLCreateFullPathFromRef(const FSRef& startingRef); -XMLCh* XMLCreateFullPathFromSpec(const FSSpec& startingSpec); +XMLCh* XMLCreateFullPathFromFSRef(const FSRef& startingRef); +XMLCh* XMLCreateFullPathFromFSSpec(const FSSpec& startingSpec); // Convert from path to FSRef/FSSpec bool XMLParsePathToFSRef(const XMLCh* const pathName, FSRef& ref); -- GitLab