logging: strip down and clean `log.h` and `log.c`

[babeltrace.git] / src / cli / babeltrace2.c

diff --git a/src/cli/babeltrace2.c b/src/cli/babeltrace2.c
index bf6c49d53ede25b6e81ef4a7d877b9dedc5aebe4..fbe38a87d93c2d82a5ab63163372b3f1de9e9a75 100644 (file)
--- a/src/cli/babeltrace2.c
+++ b/src/cli/babeltrace2.c
@@ -59,7 +59,7 @@ static bt_interrupter *the_interrupter;
 #include <windows.h>
 
 static
-BOOL WINAPI signal_handler(DWORD signal) {
+BOOL WINAPI signal_handler(DWORD signal __attribute__((unused))) {
        if (the_interrupter) {
                bt_interrupter_set(the_interrupter);
        }
@@ -253,7 +253,9 @@ end:
 
 static
 bt_value_map_foreach_entry_const_func_status collect_map_keys(
-               const char *key, const bt_value *object, void *data)
+               const char *key,
+               const bt_value *object __attribute__((unused)),
+               void *data)
 {
        GPtrArray *map_keys = data;
 
@@ -1647,7 +1649,7 @@ end:
 
 static
 bt_graph_listener_func_status graph_source_output_port_added_listener(
-               const bt_component_source *component,
+               const bt_component_source *component __attribute__((unused)),
                const bt_port_output *port, void *data)
 {
        return graph_output_port_added_listener(data, port);
@@ -1655,7 +1657,7 @@ bt_graph_listener_func_status graph_source_output_port_added_listener(
 
 static
 bt_graph_listener_func_status graph_filter_output_port_added_listener(
-               const bt_component_filter *component,
+               const bt_component_filter *component __attribute__((unused)),
                const bt_port_output *port, void *data)
 {
        return graph_output_port_added_listener(data, port);
@@ -1811,7 +1813,7 @@ bt_get_greatest_operative_mip_version_status get_greatest_operative_mip_version(
        }
 
        status = bt_get_greatest_operative_mip_version(comp_descr_set,
-               bt_cli_log_level, mip_version);
+               (bt_logging_level) bt_cli_log_level, mip_version);
 
 end:
        bt_component_descriptor_set_put_ref(comp_descr_set);
@@ -2563,7 +2565,7 @@ void warn_command_name_and_directory_clash(struct bt_config *cfg)
 
        if (g_file_test(cfg->command_name,
                        G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)) {
-               _bt_log_write_d(_BT_LOG_SRCLOC_FUNCTION, __FILE__, __LINE__,
+               bt_log_write_printf(__FILE__, __func__, __LINE__,
                                BT_LOG_WARNING, BT_LOG_TAG,
                                "The `%s` command was executed. "
                                "If you meant to convert a trace located in "
@@ -2606,8 +2608,8 @@ void print_error_causes(void)
         */
        fputc('\n',  stderr);
 
-       error_str = format_bt_error(error, columns, bt_cli_log_level,
-               BT_COMMON_COLOR_WHEN_AUTO);
+       error_str = format_bt_error(error, columns,
+               (bt_logging_level) bt_cli_log_level, BT_COMMON_COLOR_WHEN_AUTO);
        BT_ASSERT(error_str);
 
        fprintf(stderr, "%s\n", error_str);