X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcli%2Fbabeltrace2-plugins.c;h=223f09ad39b06ed5be9defc04ea4236a2bd520b6;hb=97512754fcb0e5d23147995b15a0755d797c6637;hp=42cda686ac587122f64fd9199db7c1ffda372fcd;hpb=4b3b8e4ad436df173c9ecdf8279ccaa3a6d41201;p=babeltrace.git diff --git a/src/cli/babeltrace2-plugins.c b/src/cli/babeltrace2-plugins.c index 42cda686..223f09ad 100644 --- a/src/cli/babeltrace2-plugins.c +++ b/src/cli/babeltrace2-plugins.c @@ -44,7 +44,7 @@ void fini_loaded_plugins(void) g_ptr_array_free(loaded_plugins, TRUE); } -const bt_plugin *find_loaded_plugin(const char *name) +const bt_plugin *borrow_loaded_plugin_by_name(const char *name) { int i; const bt_plugin *plugin = NULL; @@ -69,7 +69,6 @@ const bt_plugin *find_loaded_plugin(const char *name) BT_LOGI("Cannot find plugin: name=\"%s\"", name); } - bt_plugin_get_ref(plugin); return plugin; } @@ -83,7 +82,7 @@ const bt_plugin **borrow_loaded_plugins(void) return (const bt_plugin **) loaded_plugins->pdata; } -const bt_plugin *borrow_loaded_plugin(size_t index) +const bt_plugin *borrow_loaded_plugin_by_index(size_t index) { BT_ASSERT(index < loaded_plugins->len); return g_ptr_array_index(loaded_plugins, index); @@ -102,7 +101,7 @@ void add_to_loaded_plugins(const bt_plugin_set *plugin_set) const bt_plugin *plugin = bt_plugin_set_borrow_plugin_by_index_const(plugin_set, i); const bt_plugin *loaded_plugin = - find_loaded_plugin(bt_plugin_get_name(plugin)); + borrow_loaded_plugin_by_name(bt_plugin_get_name(plugin)); BT_ASSERT(plugin); @@ -113,7 +112,6 @@ void add_to_loaded_plugins(const bt_plugin_set *plugin_set) bt_plugin_get_name(plugin), bt_plugin_get_path(plugin), bt_plugin_get_path(loaded_plugin)); - bt_plugin_put_ref(loaded_plugin); } else { /* Add to global array. */ BT_LOGD("Adding plugin to loaded plugins: plugin-path=\"%s\"", @@ -130,10 +128,8 @@ int load_dynamic_plugins(const bt_value *plugin_paths) int nr_paths, i, ret = 0; 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."); - ret = -1; + if (nr_paths == 0) { + BT_LOGI_STR("No dynamic plugin path."); goto end; }