Rename "query info" to "query" everywhere, and "action" to "object"

[babeltrace.git] / converter / babeltrace-cfg.h

diff --git a/converter/babeltrace-cfg.h b/converter/babeltrace-cfg.h
index 23af3e6801b9bb811fba25be2f9bb0ed60fdba62..f78fc1aef362090fbc1b2e2404e3897af016d833 100644 (file)
--- a/converter/babeltrace-cfg.h
+++ b/converter/babeltrace-cfg.h
@@ -36,6 +36,7 @@
 
 struct bt_config_component {
        struct bt_object base;
+       enum bt_component_class_type type;
        GString *plugin_name;
        GString *component_name;
        struct bt_value *params;
@@ -46,6 +47,7 @@ enum bt_config_command {
        BT_CONFIG_COMMAND_CONVERT,
        BT_CONFIG_COMMAND_LIST_PLUGINS,
        BT_CONFIG_COMMAND_HELP,
+       BT_CONFIG_COMMAND_QUERY,
 };
 
 struct bt_config {
@@ -74,6 +76,7 @@ struct bt_config {
                        bool force_correlate;
                        bool omit_system_plugin_path;
                        bool omit_home_plugin_path;
+                       bool print_ctf_metadata;
                } convert;
 
                /* BT_CONFIG_COMMAND_LIST_PLUGINS */
@@ -88,10 +91,17 @@ struct bt_config {
                        struct bt_value *plugin_paths;
                        bool omit_system_plugin_path;
                        bool omit_home_plugin_path;
-                       enum bt_component_class_type comp_cls_type;
-                       GString *plugin_name;
-                       GString *component_name;
+                       struct bt_config_component *cfg_component;
                } help;
+
+               /* BT_CONFIG_COMMAND_QUERY */
+               struct {
+                       struct bt_value *plugin_paths;
+                       bool omit_system_plugin_path;
+                       bool omit_home_plugin_path;
+                       GString *object;
+                       struct bt_config_component *cfg_component;
+               } query;
        } cmd_data;
 };
 
@@ -107,7 +117,8 @@ struct bt_config *bt_config_from_args(int argc, const char *argv[],
                bool omit_home_plugin_path,
                struct bt_value *initial_plugin_paths);
 
-struct bt_config_component *bt_config_component_from_arg(const char *arg);
+struct bt_config_component *bt_config_component_from_arg(
+               enum bt_component_class_type type, const char *arg);
 
 enum bt_value_status bt_config_append_plugin_paths(
                struct bt_value *plugin_paths, const char *arg);