External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-23 06:23:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: xml: use #pragma once in headers

Browse Source 
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jonathon Jongsma 2019-06-18 11:13:06 -05:00 committed by Ján Tomko
parent 507b5707bc
commit c64a8d98f6
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/util/virxml.h
View File

@ -18,18 +18,17 @@
* <http://www.gnu.org/licenses/>. * <http://www.gnu.org/licenses/>.
*/ */
#ifndef LIBVIRT_VIRXML_H #pragma once
# define LIBVIRT_VIRXML_H
# include "internal.h" #include "internal.h"
# include <libxml/parser.h> #include <libxml/parser.h>
# include <libxml/tree.h> #include <libxml/tree.h>
# include <libxml/xpath.h> #include <libxml/xpath.h>
# include <libxml/relaxng.h> #include <libxml/relaxng.h>
# include "virbuffer.h" #include "virbuffer.h"
# include "virautoclean.h" #include "virautoclean.h"
int virXPathBoolean(const char *xpath, int virXPathBoolean(const char *xpath,
xmlXPathContextPtr ctxt); xmlXPathContextPtr ctxt);
@ -96,7 +95,7 @@ const char *virXMLPickShellSafeComment(const char *str1, const char *str2);
* *
* Return the parsed document object, or NULL on failure. * Return the parsed document object, or NULL on failure.
*/ */
# define virXMLParse(filename, xmlStr, url) \ #define virXMLParse(filename, xmlStr, url) \
virXMLParseHelper(VIR_FROM_THIS, filename, xmlStr, url, NULL) virXMLParseHelper(VIR_FROM_THIS, filename, xmlStr, url, NULL)
/** /**
@ -108,7 +107,7 @@ const char *virXMLPickShellSafeComment(const char *str1, const char *str2);
* *
* Return the parsed document object, or NULL on failure. * Return the parsed document object, or NULL on failure.
*/ */
# define virXMLParseString(xmlStr, url) \ #define virXMLParseString(xmlStr, url) \
virXMLParseHelper(VIR_FROM_THIS, NULL, xmlStr, url, NULL) virXMLParseHelper(VIR_FROM_THIS, NULL, xmlStr, url, NULL)
/** /**
@ -119,7 +118,7 @@ const char *virXMLPickShellSafeComment(const char *str1, const char *str2);
* *
* Return the parsed document object, or NULL on failure. * Return the parsed document object, or NULL on failure.
*/ */
# define virXMLParseFile(filename) \ #define virXMLParseFile(filename) \
virXMLParseHelper(VIR_FROM_THIS, filename, NULL, NULL, NULL) virXMLParseHelper(VIR_FROM_THIS, filename, NULL, NULL, NULL)
/** /**
@ -134,7 +133,7 @@ const char *virXMLPickShellSafeComment(const char *str1, const char *str2);
* *
* Return the parsed document object, or NULL on failure. * Return the parsed document object, or NULL on failure.
*/ */
# define virXMLParseCtxt(filename, xmlStr, url, pctxt) \ #define virXMLParseCtxt(filename, xmlStr, url, pctxt) \
virXMLParseHelper(VIR_FROM_THIS, filename, xmlStr, url, pctxt) virXMLParseHelper(VIR_FROM_THIS, filename, xmlStr, url, pctxt)
/** /**
@ -148,7 +147,7 @@ const char *virXMLPickShellSafeComment(const char *str1, const char *str2);
* *
* Return the parsed document object, or NULL on failure. * Return the parsed document object, or NULL on failure.
*/ */
# define virXMLParseStringCtxt(xmlStr, url, pctxt) \ #define virXMLParseStringCtxt(xmlStr, url, pctxt) \
virXMLParseHelper(VIR_FROM_THIS, NULL, xmlStr, url, pctxt) virXMLParseHelper(VIR_FROM_THIS, NULL, xmlStr, url, pctxt)
/** /**
@ -161,7 +160,7 @@ const char *virXMLPickShellSafeComment(const char *str1, const char *str2);
* *
* Return the parsed document object, or NULL on failure. * Return the parsed document object, or NULL on failure.
*/ */
# define virXMLParseFileCtxt(filename, pctxt) \ #define virXMLParseFileCtxt(filename, pctxt) \
virXMLParseHelper(VIR_FROM_THIS, filename, NULL, NULL, pctxt) virXMLParseHelper(VIR_FROM_THIS, filename, NULL, NULL, pctxt)
int virXMLSaveFile(const char *path, int virXMLSaveFile(const char *path,
@ -240,12 +239,10 @@ VIR_DEFINE_AUTOCLEAN_FUNC(virXPathContextNodeSave, virXPathContextNodeRestore);
* This macro ensures that when the scope where it's used ends, @ctxt's current * This macro ensures that when the scope where it's used ends, @ctxt's current
* node pointer is reset to the original value when this macro was used. * node pointer is reset to the original value when this macro was used.
*/ */
# define VIR_XPATH_NODE_AUTORESTORE(_ctxt) \ #define VIR_XPATH_NODE_AUTORESTORE(_ctxt) \
VIR_AUTOCLEAN(virXPathContextNodeSave) _ctxt ## CtxtSave = { .ctxt = _ctxt,\ VIR_AUTOCLEAN(virXPathContextNodeSave) _ctxt ## CtxtSave = { .ctxt = _ctxt,\
.node = _ctxt->node}; \ .node = _ctxt->node}; \
ignore_value(&_ctxt ## CtxtSave) ignore_value(&_ctxt ## CtxtSave)
VIR_DEFINE_AUTOPTR_FUNC(xmlDoc, xmlFreeDoc); VIR_DEFINE_AUTOPTR_FUNC(xmlDoc, xmlFreeDoc);
VIR_DEFINE_AUTOPTR_FUNC(xmlXPathContext, xmlXPathFreeContext); VIR_DEFINE_AUTOPTR_FUNC(xmlXPathContext, xmlXPathFreeContext);
#endif /* LIBVIRT_VIRXML_H */