peiyongz 2003/06/25 11:57:56
Modified: c/src/xercesc/validators/common GrammarResolver.cpp
GrammarResolver.hpp
Log:
remove old orphanGrammar()
Revision Changes Path
1.12 +19 -16 xml-xerces/c/src/xercesc/validators/common/GrammarResolver.cpp
Index: GrammarResolver.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/GrammarResolver.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- GrammarResolver.cpp 25 Jun 2003 17:44:04 -0000 1.11
+++ GrammarResolver.cpp 25 Jun 2003 18:57:56 -0000 1.12
@@ -57,6 +57,9 @@
/*
* $Log$
+ * Revision 1.12 2003/06/25 18:57:56 peiyongz
+ * remove old orphanGrammar()
+ *
* Revision 1.11 2003/06/25 17:44:04 peiyongz
* cacheGrammar() revised
*
@@ -333,31 +336,31 @@
fGrammarBucket->setAdoptElements(!fCacheGrammar);
}
-Grammar* GrammarResolver::orphanGrammar(const XMLCh* const nameSpaceKey)
-{
- XMLGrammarDescription* gramDesc = getGrammarDescription(nameSpaceKey);
- Janitor<XMLGrammarDescription> janName(gramDesc);
- return orphanGrammar(gramDesc);
-}
-
Grammar* GrammarResolver::orphanGrammar(XMLGrammarDescription* const gramDesc)
{
if (!gramDesc)
return 0;
if (fCacheGrammar)
- return fGrammarPool->orphanGrammar(gramDesc);
-
- GrammarEntry* theEntry = fGrammarBucket->orphanKey(gramDesc->getGrammarKey());
- if (theEntry)
{
- Grammar* aGrammar = theEntry->getGrammar();
- theEntry->nullGrammar();
- delete theEntry;
- return aGrammar;
+ return fGrammarPool->orphanGrammar(gramDesc);
}
+ else
+ {
+ GrammarEntry* theEntry =
fGrammarBucket->orphanKey(gramDesc->getGrammarKey());
+ if (theEntry)
+ {
+ Grammar* aGrammar = theEntry->getGrammar();
+ theEntry->nullGrammar();
+ delete theEntry;
+ return aGrammar;
+ }
+ else
+ {
+ return 0;
+ }
- return 0;
+ }
}
XMLGrammarDescription* GrammarResolver::getGrammarDescription(const XMLCh* const
nameSpaceKey)
1.9 +3 -4 xml-xerces/c/src/xercesc/validators/common/GrammarResolver.hpp
Index: GrammarResolver.hpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/validators/common/GrammarResolver.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- GrammarResolver.hpp 25 Jun 2003 17:28:47 -0000 1.8
+++ GrammarResolver.hpp 25 Jun 2003 18:57:56 -0000 1.9
@@ -185,10 +185,9 @@
* The Key entry is removed from the table (grammar is not deleted if
* adopted - now owned by caller).
*
- * @param nameSpaceKey Key to associate with Grammar abstraction
+ * @param gramDesc Key to associate with Grammar abstraction
*/
- Grammar* orphanGrammar(const XMLCh* const nameSpaceKey);
- Grammar* orphanGrammar(XMLGrammarDescription* const nameSpaceKey);
+ Grammar* orphanGrammar(XMLGrammarDescription* const gramDesc);
/**
* Cache the grammars in fGrammarBucket to fCachedGrammarRegistry.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
