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 c0acce97e7978446fee28da4e565173def719037..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;
 
@@ -636,10 +638,11 @@ enum bt_cmd_status cmd_query(struct bt_config *cfg)
        if (!comp_cls) {
                BT_CLI_LOGE_APPEND_CAUSE(
                        "Cannot find component class: plugin-name=\"%s\", "
-                       "comp-cls-name=\"%s\", comp-cls-type=%d",
+                       "comp-cls-name=\"%s\", comp-cls-type=%s",
                        cfg->cmd_data.query.cfg_component->plugin_name->str,
                        cfg->cmd_data.query.cfg_component->comp_cls_name->str,
-                       cfg->cmd_data.query.cfg_component->type);
+                       bt_common_component_class_type_string(
+                               cfg->cmd_data.query.cfg_component->type));
                goto error;
        }
 
@@ -649,11 +652,12 @@ enum bt_cmd_status cmd_query(struct bt_config *cfg)
        if (ret) {
                BT_CLI_LOGE_APPEND_CAUSE(
                        "Failed to query component class: %s: plugin-name=\"%s\", "
-                       "comp-cls-name=\"%s\", comp-cls-type=%d "
+                       "comp-cls-name=\"%s\", comp-cls-type=%s "
                        "object=\"%s\"", fail_reason,
                        cfg->cmd_data.query.cfg_component->plugin_name->str,
                        cfg->cmd_data.query.cfg_component->comp_cls_name->str,
-                       cfg->cmd_data.query.cfg_component->type,
+                       bt_common_component_class_type_string(
+                               cfg->cmd_data.query.cfg_component->type),
                        cfg->cmd_data.query.object->str);
                goto error;
        }
@@ -743,10 +747,11 @@ enum bt_cmd_status cmd_help(struct bt_config *cfg)
        if (!needed_comp_cls) {
                BT_CLI_LOGE_APPEND_CAUSE(
                        "Cannot find component class: plugin-name=\"%s\", "
-                       "comp-cls-name=\"%s\", comp-cls-type=%d",
+                       "comp-cls-name=\"%s\", comp-cls-type=%s",
                        cfg->cmd_data.help.cfg_component->plugin_name->str,
                        cfg->cmd_data.help.cfg_component->comp_cls_name->str,
-                       cfg->cmd_data.help.cfg_component->type);
+                       bt_common_component_class_type_string(
+                               cfg->cmd_data.help.cfg_component->type));
                goto error;
        }
 
@@ -904,9 +909,10 @@ enum bt_cmd_status cmd_print_lttng_live_sessions(struct bt_config *cfg)
        if (!comp_cls) {
                BT_CLI_LOGE_APPEND_CAUSE(
                        "Cannot find component class: plugin-name=\"%s\", "
-                       "comp-cls-name=\"%s\", comp-cls-type=%d",
+                       "comp-cls-name=\"%s\", comp-cls-type=%s",
                        plugin_name, comp_cls_name,
-                       BT_COMPONENT_CLASS_TYPE_SOURCE);
+                       bt_common_component_class_type_string(
+                               BT_COMPONENT_CLASS_TYPE_SOURCE));
                goto error;
        }
 
@@ -1043,9 +1049,10 @@ enum bt_cmd_status cmd_print_ctf_metadata(struct bt_config *cfg)
        if (!comp_cls) {
                BT_CLI_LOGE_APPEND_CAUSE(
                        "Cannot find component class: plugin-name=\"%s\", "
-                       "comp-cls-name=\"%s\", comp-cls-type=%d",
+                       "comp-cls-name=\"%s\", comp-cls-type=%s",
                        plugin_name, comp_cls_name,
-                       BT_COMPONENT_CLASS_TYPE_SOURCE);
+                       bt_common_component_class_type_string(
+                               BT_COMPONENT_CLASS_TYPE_SOURCE));
                goto error;
        }
 
@@ -1642,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);
@@ -1650,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);
@@ -1702,8 +1709,9 @@ int add_descriptor_to_component_descriptor_set(
        if (!comp_cls) {
                BT_CLI_LOGE_APPEND_CAUSE(
                        "Cannot find component class: plugin-name=\"%s\", "
-                       "comp-cls-name=\"%s\", comp-cls-type=%d",
-                       plugin_name, comp_cls_name, comp_cls_type);
+                       "comp-cls-name=\"%s\", comp-cls-type=%s",
+                       plugin_name, comp_cls_name,
+                       bt_common_component_class_type_string(comp_cls_type));
                status = -1;
                goto end;
        }
@@ -1805,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);
@@ -2239,10 +2247,10 @@ int cmd_run_ctx_create_components_from_config_components(
                if (!comp_cls) {
                        BT_CLI_LOGE_APPEND_CAUSE(
                                "Cannot find component class: plugin-name=\"%s\", "
-                               "comp-cls-name=\"%s\", comp-cls-type=%d",
+                               "comp-cls-name=\"%s\", comp-cls-type=%s",
                                cfg_comp->plugin_name->str,
                                cfg_comp->comp_cls_name->str,
-                               cfg_comp->type);
+                               bt_common_component_class_type_string(cfg_comp->type));
                        goto error;
                }
 
@@ -2277,11 +2285,12 @@ int cmd_run_ctx_create_components_from_config_components(
                if (ret) {
                        BT_CLI_LOGE_APPEND_CAUSE(
                                "Cannot create component: plugin-name=\"%s\", "
-                               "comp-cls-name=\"%s\", comp-cls-type=%d, "
+                               "comp-cls-name=\"%s\", comp-cls-type=%s, "
                                "comp-name=\"%s\"",
                                cfg_comp->plugin_name->str,
                                cfg_comp->comp_cls_name->str,
-                               cfg_comp->type, cfg_comp->instance_name->str);
+                               bt_common_component_class_type_string(cfg_comp->type),
+                               cfg_comp->instance_name->str);
                        goto error;
                }
 
@@ -2556,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 "
@@ -2599,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);