From: Philippe Proulx Date: Thu, 17 Aug 2017 00:57:36 +0000 (-0400) Subject: Fix: bindings/python/bt2: use appropriate log level variable names X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=fdad611f76f0819f37be88357e9e3e52cb317d81 Fix: bindings/python/bt2: use appropriate log level variable names Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- diff --git a/bindings/python/bt2/bt2/logging.c b/bindings/python/bt2/bt2/logging.c index 52d531c7..be64a862 100644 --- a/bindings/python/bt2/bt2/logging.c +++ b/bindings/python/bt2/bt2/logging.c @@ -20,7 +20,8 @@ * SOFTWARE. */ -#define BT_LOG_OUTPUT_LEVEL bt_cli_log_level +#define BT_LOG_OUTPUT_LEVEL bt_python_bindings_bt2_log_level #include -BT_LOG_INIT_LOG_LEVEL(bt_cli_log_level, "BABELTRACE_CLI_LOG_LEVEL"); +BT_LOG_INIT_LOG_LEVEL(bt_python_bindings_bt2_log_level, + "BABELTRACE_PYTHON_BT2_LOG_LEVEL"); diff --git a/bindings/python/bt2/bt2/logging.h b/bindings/python/bt2/bt2/logging.h index ccc6c527..fb0ef9f3 100644 --- a/bindings/python/bt2/bt2/logging.h +++ b/bindings/python/bt2/bt2/logging.h @@ -1,5 +1,5 @@ -#ifndef CLI_LOGGING_H -#define CLI_LOGGING_H +#ifndef BABELTRACE_BINDINGS_PYTHON_BT2_LOGGING_H +#define BABELTRACE_BINDINGS_PYTHON_BT2_LOGGING_H /* * Copyright (c) 2017 Philippe Proulx @@ -23,9 +23,9 @@ * SOFTWARE. */ -#define BT_LOG_OUTPUT_LEVEL bt_cli_log_level +#define BT_LOG_OUTPUT_LEVEL bt_python_bindings_bt2_log_level #include -BT_LOG_LEVEL_EXTERN_SYMBOL(bt_cli_log_level); +BT_LOG_LEVEL_EXTERN_SYMBOL(bt_python_bindings_bt2_log_level); -#endif /* CLI_LOGGING_H */ +#endif /* BABELTRACE_BINDINGS_PYTHON_BT2_LOGGING_H */ diff --git a/cli/babeltrace.c b/cli/babeltrace.c index 95b89c81..15db3eaf 100644 --- a/cli/babeltrace.c +++ b/cli/babeltrace.c @@ -56,16 +56,18 @@ static const char* log_level_env_var_names[] = { "BABELTRACE_COMMON_LOG_LEVEL", "BABELTRACE_PLUGIN_CTF_BTR_LOG_LEVEL", + "BABELTRACE_PLUGIN_CTF_FS_SINK_LOG_LEVEL", "BABELTRACE_PLUGIN_CTF_FS_SRC_LOG_LEVEL", "BABELTRACE_PLUGIN_CTF_LTTNG_LIVE_SRC_LOG_LEVEL", "BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL", "BABELTRACE_PLUGIN_CTF_NOTIF_ITER_LOG_LEVEL", + "BABELTRACE_PLUGIN_CTFCOPYTRACE_LIB_LOG_LEVEL", "BABELTRACE_PLUGIN_LTTNG_UTILS_DEBUG_INFO_FLT_LOG_LEVEL", "BABELTRACE_PLUGIN_TEXT_DMESG_SRC_LOG_LEVEL", + "BABELTRACE_PLUGIN_TEXT_PRETTY_SINK_LOG_LEVEL", "BABELTRACE_PLUGIN_UTILS_MUXER_FLT_LOG_LEVEL", "BABELTRACE_PLUGIN_UTILS_TRIMMER_FLT_LOG_LEVEL", - "BABELTRACE_PLUGIN_CTFCOPYTRACE_LIB_LOG_LEVEL", - "BABELTRACE_PLUGIN_CTF_FS_SINK_LOG_LEVEL", + "BABELTRACE_PYTHON_BT2_LOG_LEVEL", "BABELTRACE_PYTHON_PLUGIN_PROVIDER_LOG_LEVEL", NULL, };