amassari 2005/01/26 05:40:20
Modified: c/src/xercesc/dom/impl DOMConfigurationImpl.cpp
DOMNodeImpl.cpp
Log:
Removed warnings
Revision Changes Path
1.11 +7 -26
xml-xerces/c/src/xercesc/dom/impl/DOMConfigurationImpl.cpp
Index: DOMConfigurationImpl.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMConfigurationImpl.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- DOMConfigurationImpl.cpp 6 Jan 2005 21:39:43 -0000 1.10
+++ DOMConfigurationImpl.cpp 26 Jan 2005 13:40:20 -0000 1.11
@@ -99,22 +99,16 @@
throw DOMException(DOMException::NOT_SUPPORTED_ERR, 0,
fMemoryManager);
}
- bool isBooleanParameter = true;
DOMConfigurationFeature whichFlag;
try {
whichFlag = getFeatureFlag(lowerCaseName);
- } catch(DOMException&) {
- // must not be a boolean parameter
- isBooleanParameter = false;
- }
-
- if(isBooleanParameter) {
if(*((bool*)value)) {
featureValues |= whichFlag;
} else {
featureValues &= ~whichFlag;
}
- } else {
+ } catch(DOMException&) {
+ // must not be a boolean parameter
if(XMLString::equals(lowerCaseName, fgERROR_HANDLER)) {
fErrorHandler = (DOMErrorHandler*)value;
} else if (XMLString::equals(lowerCaseName, fgSCHEMA_TYPE)) {
@@ -139,22 +133,16 @@
XMLString::lowerCase(lowerCaseName);
- bool isBooleanParameter = true;
DOMConfigurationFeature whichFlag;
try {
whichFlag = getFeatureFlag(lowerCaseName);
- } catch (DOMException&) {
- // must not be a boolean parameter
- isBooleanParameter = false;
- }
-
- if(isBooleanParameter){
if(featureValues & whichFlag) {
return &fTrue;
} else {
return &fFalse;
}
- } else {
+ } catch (DOMException&) {
+ // must not be a boolean parameter
if(XMLString::equals(lowerCaseName, fgERROR_HANDLER)) {
return fErrorHandler;
} else if (XMLString::equals(lowerCaseName, fgSCHEMA_TYPE)) {
@@ -190,18 +178,10 @@
XMLString::lowerCase(lowerCaseName);
- bool isBooleanParameter = true;
- bool booleanValue = false;
DOMConfigurationFeature whichFlag;
try {
whichFlag = getFeatureFlag(lowerCaseName);
- booleanValue = *((bool*)value);
- } catch (DOMException&) {
- // must not be a boolean parameter
- isBooleanParameter = false;
- }
-
- if(isBooleanParameter) {
+ bool booleanValue = *((bool*)value);
switch (whichFlag) {
case FEATURE_CANONICAL_FORM:
if(booleanValue) return false; // optional //
@@ -246,7 +226,8 @@
else return false; // optional //
default: return false; // should never be here
}
- } else {
+ } catch (DOMException&) {
+ // must not be a boolean parameter
if(XMLString::equals(lowerCaseName, fgERROR_HANDLER)) {
return true; // required //
} else if (XMLString::equals(lowerCaseName, fgSCHEMA_TYPE)) {
1.36 +2 -4 xml-xerces/c/src/xercesc/dom/impl/DOMNodeImpl.cpp
Index: DOMNodeImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMNodeImpl.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- DOMNodeImpl.cpp 20 Oct 2004 15:18:20 -0000 1.35
+++ DOMNodeImpl.cpp 26 Jan 2005 13:40:20 -0000 1.36
@@ -363,10 +363,8 @@
if (XMLString::equals(namespaceURI, XMLUni::fgXMLNSURIName))
return XMLUni::fgXMLNSURIName;
throw DOMException(DOMException::NAMESPACE_ERR, 0);
- } else if (namespaceURI == 0 || *namespaceURI == 0) {
+ } else if (namespaceURI == 0 || *namespaceURI == 0)
throw DOMException(DOMException::NAMESPACE_ERR, 0);
- } else
- return namespaceURI;
return namespaceURI;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
