mirror/openvpn3
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn3.git synced 2024-09-20 12:12:15 +02:00
Code

xmlhelper: misc changes

Browse Source 
* added next_sibling() methods
* fully specify tinyxml2::XMLDocument::Parse()
* use #pragma once

Signed-off-by: James Yonan <james@openvpn.net>
This commit is contained in:
James Yonan 2018-08-20 01:14:39 -06:00 committed by Lev Stipakov
parent 71c55b6e48
commit 4253b28896
No known key found for this signature in database
GPG Key ID: 88670BE258B9C258
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
openvpn/common/xmlhelper.hpp
View File

@ -6,8 +6,7 @@
// All rights reserved.
//
#ifndef OPENVPN_COMMON_WAITFORFILE_H
#define OPENVPN_COMMON_WAITFORFILE_H
#pragma once
#include <string>
@ -25,7 +24,7 @@ namespace openvpn {
Document(const std::string& str,
const std::string& title)
{
if (Parse(str.c_str()))
if (tinyxml2::XMLDocument::Parse(str.c_str()))
OPENVPN_THROW(xml_parse, title << " : " << format_error(*this));
}
};
@ -94,7 +93,23 @@ namespace openvpn {
{
return elem;
}
static const tinyxml2::XMLElement* next_sibling(const tinyxml2::XMLNode* node,
const std::string& name)
{
return node->NextSiblingElement(name.c_str());
}
static const tinyxml2::XMLElement* next_sibling(const tinyxml2::XMLNode* node,
const char *name)
{
return node->NextSiblingElement(name);
}
static const tinyxml2::XMLElement* next_sibling(const tinyxml2::XMLNode* node)
{
return node->NextSiblingElement();
}
};
}
#endif