Make --plugin-path optional
authorJérémie Galarneau <jeremie.galarneau@efficios.com>
Fri, 28 Oct 2016 20:35:24 +0000 (16:35 -0400)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Sat, 27 May 2017 18:09:06 +0000 (14:09 -0400)
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
converter/babeltrace.c

index 88d8423ec043b431444f6df7795744e01e69ca29..d6a9faa0d92b17600aee8c057efe76d3c073243b 100644 (file)
@@ -279,12 +279,6 @@ int main(int argc, char **argv)
 
        printf_verbose("Verbose mode active.\n");
        printf_debug("Debug mode active.\n");
-
-       if (bt_value_array_is_empty(cfg->plugin_paths)) {
-               fprintf(stderr, "No plugin path specified, aborting...\n");
-               ret = -1;
-               goto end;
-       }
        component_factory = bt_component_factory_create();
        if (!component_factory) {
                fprintf(stderr, "Failed to create component factory.\n");
@@ -292,14 +286,17 @@ int main(int argc, char **argv)
                goto end;
        }
 
-       first_plugin_path_value = bt_value_array_get(cfg->plugin_paths, 0);
-       bt_value_string_get(first_plugin_path_value, &first_plugin_path);
-
-       ret = bt_component_factory_load_recursive(component_factory,
-                       first_plugin_path);
-       if (ret) {
-               fprintf(stderr, "Failed to load plugins.\n");
-               goto end;
+       if (cfg->plugin_paths && !bt_value_array_is_empty(cfg->plugin_paths)) {
+               first_plugin_path_value = bt_value_array_get(
+                               cfg->plugin_paths, 0);
+               bt_value_string_get(first_plugin_path_value,
+                               &first_plugin_path);
+               ret = bt_component_factory_load_recursive(component_factory,
+                               first_plugin_path);
+               if (ret) {
+                       fprintf(stderr, "Failed to dynamically load plugins.\n");
+                       goto end;
+               }
        }
 
        ret = bt_component_factory_load_static(component_factory);
This page took 0.026884 seconds and 4 git commands to generate.