mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
util: log: use #pragma once in headers
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:
parent
2edd1c1d86
commit
65d6a1df03
@ -19,13 +19,12 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef LIBVIRT_VIRLOG_H
|
#pragma once
|
||||||
# define LIBVIRT_VIRLOG_H
|
|
||||||
|
|
||||||
# include "internal.h"
|
#include "internal.h"
|
||||||
# include "virbuffer.h"
|
#include "virbuffer.h"
|
||||||
|
|
||||||
# ifdef PACKAGER_VERSION
|
#ifdef PACKAGER_VERSION
|
||||||
# ifdef PACKAGER
|
# ifdef PACKAGER
|
||||||
# define VIR_LOG_VERSION_STRING \
|
# define VIR_LOG_VERSION_STRING \
|
||||||
"libvirt version: " VERSION ", package: " PACKAGER_VERSION " (" PACKAGER ")"
|
"libvirt version: " VERSION ", package: " PACKAGER_VERSION " (" PACKAGER ")"
|
||||||
@ -33,10 +32,10 @@
|
|||||||
# define VIR_LOG_VERSION_STRING \
|
# define VIR_LOG_VERSION_STRING \
|
||||||
"libvirt version: " VERSION ", package: " PACKAGER_VERSION
|
"libvirt version: " VERSION ", package: " PACKAGER_VERSION
|
||||||
# endif
|
# endif
|
||||||
# else
|
#else
|
||||||
# define VIR_LOG_VERSION_STRING \
|
# define VIR_LOG_VERSION_STRING \
|
||||||
"libvirt version: " VERSION
|
"libvirt version: " VERSION
|
||||||
# endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* To be made public
|
* To be made public
|
||||||
@ -48,7 +47,7 @@ typedef enum {
|
|||||||
VIR_LOG_ERROR,
|
VIR_LOG_ERROR,
|
||||||
} virLogPriority;
|
} virLogPriority;
|
||||||
|
|
||||||
# define VIR_LOG_DEFAULT VIR_LOG_WARN
|
#define VIR_LOG_DEFAULT VIR_LOG_WARN
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
VIR_LOG_TO_STDERR = 0,
|
VIR_LOG_TO_STDERR = 0,
|
||||||
@ -73,7 +72,7 @@ struct _virLogSource {
|
|||||||
* log statements in a file are conditionally disabled
|
* log statements in a file are conditionally disabled
|
||||||
* at compile time due to configure options.
|
* at compile time due to configure options.
|
||||||
*/
|
*/
|
||||||
# define VIR_LOG_INIT(n) \
|
#define VIR_LOG_INIT(n) \
|
||||||
static ATTRIBUTE_UNUSED virLogSource virLogSelf = { \
|
static ATTRIBUTE_UNUSED virLogSource virLogSelf = { \
|
||||||
.name = "" n "", \
|
.name = "" n "", \
|
||||||
.priority = VIR_LOG_ERROR, \
|
.priority = VIR_LOG_ERROR, \
|
||||||
@ -86,10 +85,10 @@ struct _virLogSource {
|
|||||||
* are printed to stderr for debugging or to an appropriate channel
|
* are printed to stderr for debugging or to an appropriate channel
|
||||||
* defined at runtime from the libvirt daemon configuration file
|
* defined at runtime from the libvirt daemon configuration file
|
||||||
*/
|
*/
|
||||||
# ifdef ENABLE_DEBUG
|
#ifdef ENABLE_DEBUG
|
||||||
# define VIR_DEBUG_INT(src, filename, linenr, funcname, ...) \
|
# define VIR_DEBUG_INT(src, filename, linenr, funcname, ...) \
|
||||||
virLogMessage(src, VIR_LOG_DEBUG, filename, linenr, funcname, NULL, __VA_ARGS__)
|
virLogMessage(src, VIR_LOG_DEBUG, filename, linenr, funcname, NULL, __VA_ARGS__)
|
||||||
# else
|
#else
|
||||||
/**
|
/**
|
||||||
* virLogEatParams:
|
* virLogEatParams:
|
||||||
*
|
*
|
||||||
@ -102,22 +101,22 @@ static inline void virLogEatParams(virLogSourcePtr unused, ...)
|
|||||||
}
|
}
|
||||||
# define VIR_DEBUG_INT(src, filename, linenr, funcname, ...) \
|
# define VIR_DEBUG_INT(src, filename, linenr, funcname, ...) \
|
||||||
virLogEatParams(src, filename, linenr, funcname, __VA_ARGS__)
|
virLogEatParams(src, filename, linenr, funcname, __VA_ARGS__)
|
||||||
# endif /* !ENABLE_DEBUG */
|
#endif /* !ENABLE_DEBUG */
|
||||||
|
|
||||||
# define VIR_INFO_INT(src, filename, linenr, funcname, ...) \
|
#define VIR_INFO_INT(src, filename, linenr, funcname, ...) \
|
||||||
virLogMessage(src, VIR_LOG_INFO, filename, linenr, funcname, NULL, __VA_ARGS__)
|
virLogMessage(src, VIR_LOG_INFO, filename, linenr, funcname, NULL, __VA_ARGS__)
|
||||||
# define VIR_WARN_INT(src, filename, linenr, funcname, ...) \
|
#define VIR_WARN_INT(src, filename, linenr, funcname, ...) \
|
||||||
virLogMessage(src, VIR_LOG_WARN, filename, linenr, funcname, NULL, __VA_ARGS__)
|
virLogMessage(src, VIR_LOG_WARN, filename, linenr, funcname, NULL, __VA_ARGS__)
|
||||||
# define VIR_ERROR_INT(src, filename, linenr, funcname, ...) \
|
#define VIR_ERROR_INT(src, filename, linenr, funcname, ...) \
|
||||||
virLogMessage(src, VIR_LOG_ERROR, filename, linenr, funcname, NULL, __VA_ARGS__)
|
virLogMessage(src, VIR_LOG_ERROR, filename, linenr, funcname, NULL, __VA_ARGS__)
|
||||||
|
|
||||||
# define VIR_DEBUG(...) \
|
#define VIR_DEBUG(...) \
|
||||||
VIR_DEBUG_INT(&virLogSelf, __FILE__, __LINE__, __func__, __VA_ARGS__)
|
VIR_DEBUG_INT(&virLogSelf, __FILE__, __LINE__, __func__, __VA_ARGS__)
|
||||||
# define VIR_INFO(...) \
|
#define VIR_INFO(...) \
|
||||||
VIR_INFO_INT(&virLogSelf, __FILE__, __LINE__, __func__, __VA_ARGS__)
|
VIR_INFO_INT(&virLogSelf, __FILE__, __LINE__, __func__, __VA_ARGS__)
|
||||||
# define VIR_WARN(...) \
|
#define VIR_WARN(...) \
|
||||||
VIR_WARN_INT(&virLogSelf, __FILE__, __LINE__, __func__, __VA_ARGS__)
|
VIR_WARN_INT(&virLogSelf, __FILE__, __LINE__, __func__, __VA_ARGS__)
|
||||||
# define VIR_ERROR(...) \
|
#define VIR_ERROR(...) \
|
||||||
VIR_ERROR_INT(&virLogSelf, __FILE__, __LINE__, __func__, __VA_ARGS__)
|
VIR_ERROR_INT(&virLogSelf, __FILE__, __LINE__, __func__, __VA_ARGS__)
|
||||||
|
|
||||||
|
|
||||||
@ -238,5 +237,3 @@ int virLogParseOutputs(const char *src,
|
|||||||
virLogOutputPtr **outputs) ATTRIBUTE_NONNULL(1);
|
virLogOutputPtr **outputs) ATTRIBUTE_NONNULL(1);
|
||||||
int virLogParseFilters(const char *src,
|
int virLogParseFilters(const char *src,
|
||||||
virLogFilterPtr **filters) ATTRIBUTE_NONNULL(1);
|
virLogFilterPtr **filters) ATTRIBUTE_NONNULL(1);
|
||||||
|
|
||||||
#endif /* LIBVIRT_VIRLOG_H */
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user