diff options
Diffstat (limited to '')
| -rw-r--r-- | src/burn/engine/manifest.cpp | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/burn/engine/manifest.cpp b/src/burn/engine/manifest.cpp index 0cd10dbb..c0d67c19 100644 --- a/src/burn/engine/manifest.cpp +++ b/src/burn/engine/manifest.cpp | |||
| @@ -67,31 +67,14 @@ static HRESULT ParseFromXml( | |||
| 67 | { | 67 | { |
| 68 | HRESULT hr = S_OK; | 68 | HRESULT hr = S_OK; |
| 69 | IXMLDOMElement* pixeBundle = NULL; | 69 | IXMLDOMElement* pixeBundle = NULL; |
| 70 | IXMLDOMNode* pixnLog = NULL; | ||
| 71 | IXMLDOMNode* pixnChain = NULL; | 70 | IXMLDOMNode* pixnChain = NULL; |
| 72 | 71 | ||
| 73 | // get bundle element | 72 | // get bundle element |
| 74 | hr = pixdDocument->get_documentElement(&pixeBundle); | 73 | hr = pixdDocument->get_documentElement(&pixeBundle); |
| 75 | ExitOnFailure(hr, "Failed to get bundle element."); | 74 | ExitOnFailure(hr, "Failed to get bundle element."); |
| 76 | 75 | ||
| 77 | // parse the log element, if present. | 76 | hr = LoggingParseFromXml(&pEngineState->log, pixeBundle); |
| 78 | hr = XmlSelectSingleNode(pixeBundle, L"Log", &pixnLog); | 77 | ExitOnFailure(hr, "Failed to parse logging."); |
| 79 | ExitOnFailure(hr, "Failed to get Log element."); | ||
| 80 | |||
| 81 | if (S_OK == hr) | ||
| 82 | { | ||
| 83 | hr = XmlGetAttributeEx(pixnLog, L"PathVariable", &pEngineState->log.sczPathVariable); | ||
| 84 | if (E_NOTFOUND != hr) | ||
| 85 | { | ||
| 86 | ExitOnFailure(hr, "Failed to get Log/@PathVariable."); | ||
| 87 | } | ||
| 88 | |||
| 89 | hr = XmlGetAttributeEx(pixnLog, L"Prefix", &pEngineState->log.sczPrefix); | ||
| 90 | ExitOnFailure(hr, "Failed to get Log/@Prefix attribute."); | ||
| 91 | |||
| 92 | hr = XmlGetAttributeEx(pixnLog, L"Extension", &pEngineState->log.sczExtension); | ||
| 93 | ExitOnFailure(hr, "Failed to get Log/@Extension attribute."); | ||
| 94 | } | ||
| 95 | 78 | ||
| 96 | // get the chain element | 79 | // get the chain element |
| 97 | hr = XmlSelectSingleNode(pixeBundle, L"Chain", &pixnChain); | 80 | hr = XmlSelectSingleNode(pixeBundle, L"Chain", &pixnChain); |
| @@ -167,7 +150,6 @@ static HRESULT ParseFromXml( | |||
| 167 | 150 | ||
| 168 | LExit: | 151 | LExit: |
| 169 | ReleaseObject(pixnChain); | 152 | ReleaseObject(pixnChain); |
| 170 | ReleaseObject(pixnLog); | ||
| 171 | ReleaseObject(pixeBundle); | 153 | ReleaseObject(pixeBundle); |
| 172 | return hr; | 154 | return hr; |
| 173 | } | 155 | } |
