X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcli%2Fbabeltrace2-plugins.c;h=28ee50a51b10d30258bc7f53e35f950bc464f39f;hb=70dfe5e41a18dc2225d1b80dccd547050ee5df35;hp=73123408a542a88045f22c340e489166e9f6a722;hpb=3c729b9af1b926f739be5bbba4ec20a296746023;p=babeltrace.git

diff --git a/src/cli/babeltrace2-plugins.c b/src/cli/babeltrace2-plugins.c
index 73123408..28ee50a5 100644
--- a/src/cli/babeltrace2-plugins.c
+++ b/src/cli/babeltrace2-plugins.c
@@ -77,6 +77,11 @@ size_t get_loaded_plugins_count(void)
 	return loaded_plugins->len;
 }
 
+const bt_plugin **borrow_loaded_plugins(void)
+{
+	return (const bt_plugin **) loaded_plugins->pdata;
+}
+
 const bt_plugin *borrow_loaded_plugin(size_t index)
 {
 	BT_ASSERT(index < loaded_plugins->len);
@@ -123,7 +128,7 @@ int load_dynamic_plugins(const bt_value *plugin_paths)
 {
 	int nr_paths, i, ret = 0;
 
-	nr_paths = bt_value_array_get_size(plugin_paths);
+	nr_paths = bt_value_array_get_length(plugin_paths);
 	if (nr_paths < 0) {
 		BT_CLI_LOGE_APPEND_CAUSE(
 			"Cannot load dynamic plugins: no plugin path.");
@@ -158,9 +163,11 @@ int load_dynamic_plugins(const bt_value *plugin_paths)
 		status = bt_plugin_find_all_from_dir(plugin_path, BT_FALSE,
 			BT_FALSE, &plugin_set);
 		if (status < 0) {
-			BT_LOGE("Unable to load dynamic plugins from directory: "
+			BT_CLI_LOGE_APPEND_CAUSE(
+				"Unable to load dynamic plugins from directory: "
 				"path=\"%s\"", plugin_path);
-			continue;
+			ret = status;
+			goto end;
 		} else if (status ==
 				BT_PLUGIN_FIND_ALL_FROM_DIR_STATUS_NOT_FOUND) {
 			BT_LOGI("No plugins found in directory: path=\"%s\"",