amassari 2005/01/06 23:59:40
Modified: c/src/xercesc/parsers AbstractDOMParser.cpp
c/src/xercesc/internal IGXMLScanner.cpp SGXMLScanner.cpp
Log:
Removed unused variables
Revision Changes Path
1.70 +2 -5 xml-xerces/c/src/xercesc/parsers/AbstractDOMParser.cpp
Index: AbstractDOMParser.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/parsers/AbstractDOMParser.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- AbstractDOMParser.cpp 6 Jan 2005 21:39:44 -0000 1.69
+++ AbstractDOMParser.cpp 7 Jan 2005 07:59:39 -0000 1.70
@@ -759,12 +759,9 @@
if (!fCreateEntityReferenceNodes) return;
DOMEntityReferenceImpl *erImpl = 0;
- DOMNode* firstChild = 0;
- if (fCurrentParent->getNodeType() == DOMNode::ENTITY_REFERENCE_NODE) {
+ if (fCurrentParent->getNodeType() == DOMNode::ENTITY_REFERENCE_NODE)
erImpl = (DOMEntityReferenceImpl *) fCurrentParent;
- firstChild = erImpl->getFirstChild();
- }
fCurrentParent = fNodeStack->pop();
1.84 +1 -16 xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp
Index: IGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- IGXMLScanner.cpp 3 Jan 2005 11:41:16 -0000 1.83
+++ IGXMLScanner.cpp 7 Jan 2005 07:59:39 -0000 1.84
@@ -2274,8 +2274,6 @@
// generic element decl object. We tell him to fault one in if he does
// not find it.
bool wasAdded = false;
- bool errorBeforeElementFound = false;
- bool laxBeforeElementFound = false;
const XMLCh* nameRawBuf = &qnameRawBuf[prefixColonPos + 1];
const XMLCh* original_uriStr = fGrammar->getTargetNamespace();
@@ -2320,10 +2318,7 @@
XMLValid::GrammarNotFound
,uriStr
);
- errorBeforeElementFound = true;
}
- else if(errorCondition)
- laxBeforeElementFound = true;
elemDecl = fGrammar->getElemDecl
(
@@ -2368,10 +2363,7 @@
XMLValid::ElementNotUnQualified
, elemDecl->getFullName()
);
- errorBeforeElementFound = true;
}
- else if(errorCondition)
- laxBeforeElementFound = true;
}
}
@@ -2451,10 +2443,7 @@
XMLValid::GrammarNotFound
, XMLUni::fgZeroLenString
);
- errorBeforeElementFound = true;
}
- else if(errorCondition)
- laxBeforeElementFound = true;
elemDecl = fGrammar->getElemDecl
(
@@ -2492,10 +2481,7 @@
XMLValid::GrammarNotFound
,original_uriStr
);
- errorBeforeElementFound = true;
}
- else if(errorCondition)
- laxBeforeElementFound = true;
elemDecl = fGrammar->getElemDecl
(
@@ -2510,7 +2496,6 @@
XMLValid::ElementNotQualified
, elemDecl->getFullName()
);
- errorBeforeElementFound = true;
}
}
}
1.106 +2 -19 xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp
Index: SGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/SGXMLScanner.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- SGXMLScanner.cpp 6 Jan 2005 21:39:43 -0000 1.105
+++ SGXMLScanner.cpp 7 Jan 2005 07:59:39 -0000 1.106
@@ -1198,8 +1198,6 @@
// not find it.
XMLElementDecl* elemDecl = 0;
bool wasAdded = false;
- bool errorBeforeElementFound = false;
- bool laxBeforeElementFound = false;
const XMLCh* nameRawBuf = &qnameRawBuf[prefixColonPos + 1];
const XMLCh* original_uriStr = fGrammar->getTargetNamespace();
@@ -1235,10 +1233,7 @@
XMLValid::GrammarNotFound
,uriStr
);
- errorBeforeElementFound = true;
}
- else if(errorCondition)
- laxBeforeElementFound = true;
elemDecl = fGrammar->getElemDecl
(
@@ -1281,11 +1276,7 @@
XMLValid::ElementNotUnQualified
, elemDecl->getFullName()
);
- errorBeforeElementFound = true;
}
- else if(errorCondition)
- laxBeforeElementFound = true;
-
}
}
@@ -1343,12 +1334,8 @@
(
XMLValid::GrammarNotFound
, XMLUni::fgZeroLenString
- );
- errorBeforeElementFound = true;
-
+ );
}
- else if(errorCondition)
- laxBeforeElementFound = true;
elemDecl = fGrammar->getElemDecl
(
@@ -1385,10 +1372,7 @@
XMLValid::GrammarNotFound
,original_uriStr
);
- errorBeforeElementFound = true;
}
- else if(errorCondition)
- laxBeforeElementFound = true;
elemDecl = fGrammar->getElemDecl
(
@@ -1403,7 +1387,6 @@
XMLValid::ElementNotQualified
, elemDecl->getFullName()
);
- errorBeforeElementFound = true;
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]