From 37996f2f190c8d0f35271c785121f6c2df0aba49 Mon Sep 17 00:00:00 2001 From: Francis Deslauriers Date: Thu, 31 Oct 2019 13:40:07 -0400 Subject: [PATCH] lib: lib-logging.c: `Babeltrace library` -> `libbabeltrace2` Signed-off-by: Francis Deslauriers Change-Id: Ibb0de3faa3bdc30fcead46467a69d8ece5d5792f Reviewed-on: https://review.lttng.org/c/babeltrace/+/2314 Reviewed-by: Philippe Proulx Tested-by: jenkins --- src/lib/lib-logging.c | 3 ++- src/lib/logging.h | 2 ++ src/lib/plugin/plugin.c | 2 +- src/python-plugin-provider/python-plugin-provider.c | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c index 8d357e30..c648e336 100644 --- a/src/lib/lib-logging.c +++ b/src/lib/lib-logging.c @@ -1522,7 +1522,8 @@ void bt_lib_maybe_log_and_append_cause(const char *func, const char *file, } status = bt_current_thread_error_append_cause_from_unknown( - "Babeltrace library", file, line, "%s", lib_logging_buf); + BT_LIB_LOG_LIBBABELTRACE2_NAME, file, line, "%s", + lib_logging_buf); if (status) { /* * Worst case: this error cause is not appended to the diff --git a/src/lib/logging.h b/src/lib/logging.h index 2598b473..2c55f14f 100644 --- a/src/lib/logging.h +++ b/src/lib/logging.h @@ -34,6 +34,8 @@ #include "logging/log.h" +#define BT_LIB_LOG_LIBBABELTRACE2_NAME "libbabeltrace2" + extern int bt_lib_log_level; diff --git a/src/lib/plugin/plugin.c b/src/lib/plugin/plugin.c index 52614fbb..58a24190 100644 --- a/src/lib/plugin/plugin.c +++ b/src/lib/plugin/plugin.c @@ -621,7 +621,7 @@ int bt_plugin_create_append_all_from_dir(struct bt_plugin_set *plugin_set, ": path=\"%s\", recurse=%d", path, recurse); (void) BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_UNKNOWN( - "Babeltrace library", + BT_LIB_LOG_LIBBABELTRACE2_NAME, "Cannot open directory: path=\"%s\", recurse=%d", path, recurse); status = BT_FUNC_STATUS_ERROR; diff --git a/src/python-plugin-provider/python-plugin-provider.c b/src/python-plugin-provider/python-plugin-provider.c index c6b60656..11a74821 100644 --- a/src/python-plugin-provider/python-plugin-provider.c +++ b/src/python-plugin-provider/python-plugin-provider.c @@ -82,7 +82,7 @@ void append_python_traceback_error_cause(void) } (void) BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_UNKNOWN( - "Babeltrace library", "%s", exc->str); + BT_LIB_LOG_LIBBABELTRACE2_NAME, "%s", exc->str); } end: -- 2.34.1