X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbindings%2Fpython%2Fbt2%2Fbt2%2Fnative_bt_autodisc.i.h;h=43e9dc82e534f6e244c6b04c89b1c6f48e14f840;hb=dfa664f9be160bace24f960b444818d06e75aeb5;hp=e09f54e768b803f713e82380fb44c8a4395be3d1;hpb=f3c9a159782f70dbd0e5dedb37e4a1ef8a6d304e;p=babeltrace.git

diff --git a/src/bindings/python/bt2/bt2/native_bt_autodisc.i.h b/src/bindings/python/bt2/bt2/native_bt_autodisc.i.h
index e09f54e7..43e9dc82 100644
--- a/src/bindings/python/bt2/bt2/native_bt_autodisc.i.h
+++ b/src/bindings/python/bt2/bt2/native_bt_autodisc.i.h
@@ -1,25 +1,7 @@
 /*
- * The MIT License (MIT)
+ * SPDX-License-Identifier: MIT
  *
  * Copyright (c) 2016 Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
  */
 
 #include <autodisc/autodisc.h>
@@ -47,6 +29,7 @@
  * This function can also return None, if it failed to allocate memory
  * for the return value and status code.
  */
+static
 bt_value *bt_bt2_auto_discover_source_components(const bt_value *inputs,
 		const bt_plugin_set *plugin_set)
 {
@@ -62,16 +45,17 @@ bt_value *bt_bt2_auto_discover_source_components(const bt_value *inputs,
 	bt_value_map_insert_entry_status insert_entry_status;
 
 	BT_ASSERT(bt_value_get_type(inputs) == BT_VALUE_TYPE_ARRAY);
-	for (i = 0; i < bt_value_array_get_size(inputs); i++) {
+	for (i = 0; i < bt_value_array_get_length(inputs); i++) {
 		const bt_value *elem = bt_value_array_borrow_element_by_index_const(inputs, i);
 		BT_ASSERT(bt_value_get_type(elem) == BT_VALUE_TYPE_STRING);
 	}
 
 	result = bt_value_map_create();
 	if (!result) {
-		static const char * const err = "Failed to create a map value.";
-		BT_LOGE_STR(err);
-		BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_UNKNOWN(module_name, err);
+#define BT_FMT "Failed to create a map value."
+		BT_LOGE_STR(BT_FMT);
+		BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_UNKNOWN(module_name, BT_FMT);
+#undef BT_FMT
 		PyErr_NoMemory();
 		goto end;
 	}
@@ -102,7 +86,8 @@ bt_value *bt_bt2_auto_discover_source_components(const bt_value *inputs,
 		plugin_count,
 		NULL,
 		bt_python_bindings_bt2_log_level,
-		&auto_disc);
+		&auto_disc,
+		NULL);
 	if (status != 0) {
 		BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_UNKNOWN(module_name,
                 	"Failed to auto discover sources.");
@@ -126,7 +111,7 @@ bt_value *bt_bt2_auto_discover_source_components(const bt_value *inputs,
 	}
 
 	for (i = 0; i < auto_disc.results->len; i++) {
-		struct auto_source_discovery_result *result =
+		struct auto_source_discovery_result *autodisc_result =
 			g_ptr_array_index(auto_disc.results, i);
 		bt_value_array_append_element_status append_element_status;
 
@@ -139,7 +124,7 @@ bt_value *bt_bt2_auto_discover_source_components(const bt_value *inputs,
 		}
 
 		append_element_status = bt_value_array_append_string_element(
-			component_info, result->plugin_name);
+			component_info, autodisc_result->plugin_name);
 		if (append_element_status != BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK) {
 			BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_UNKNOWN(module_name,
                 		"Failed to append one array element.");
@@ -148,7 +133,7 @@ bt_value *bt_bt2_auto_discover_source_components(const bt_value *inputs,
 		}
 
 		append_element_status = bt_value_array_append_string_element(
-			component_info, result->source_cc_name);
+			component_info, autodisc_result->source_cc_name);
 		if (append_element_status != BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK) {
 			BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_UNKNOWN(module_name,
                 		"Failed to append one array element.");
@@ -157,7 +142,7 @@ bt_value *bt_bt2_auto_discover_source_components(const bt_value *inputs,
 		}
 
 		append_element_status = bt_value_array_append_element(
-			component_info, result->inputs);
+			component_info, autodisc_result->inputs);
 		if (append_element_status != BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK) {
 			BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_UNKNOWN(module_name,
                 		"Failed to append one array element.");
@@ -166,7 +151,7 @@ bt_value *bt_bt2_auto_discover_source_components(const bt_value *inputs,
 		}
 
 		append_element_status = bt_value_array_append_element(
-			component_info, result->original_input_indices);
+			component_info, autodisc_result->original_input_indices);
 		if (append_element_status != BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK) {
 			BT_CURRENT_THREAD_ERROR_APPEND_CAUSE_FROM_UNKNOWN(module_name,
                 		"Failed to append one array element.");