values: make `bt_value_map_extend()` extend the provided base map

[babeltrace.git] / include / babeltrace2 / value-const.h

diff --git a/include/babeltrace2/value-const.h b/include/babeltrace2/value-const.h
index de89d259a3cbe0208c6776bb16e11ce052fc5be7..2f1ffe779b653bfdfc241f545b1de325fd15d366 100644 (file)
--- a/include/babeltrace2/value-const.h
+++ b/include/babeltrace2/value-const.h
@@ -120,25 +120,25 @@ typedef enum bt_value_copy_status {
 extern bt_value_copy_status bt_value_copy(const bt_value *object,
                bt_value **copy);
 
-extern bt_bool bt_value_compare(const bt_value *object_a,
+extern bt_bool bt_value_is_equal(const bt_value *object_a,
                const bt_value *object_b);
 
 extern bt_bool bt_value_bool_get(const bt_value *bool_obj);
 
-extern uint64_t bt_value_unsigned_integer_get(const bt_value *integer_obj);
+extern uint64_t bt_value_integer_unsigned_get(const bt_value *integer_obj);
 
-extern int64_t bt_value_signed_integer_get(const bt_value *integer_obj);
+extern int64_t bt_value_integer_signed_get(const bt_value *integer_obj);
 
 extern double bt_value_real_get(const bt_value *real_obj);
 
 extern const char *bt_value_string_get(const bt_value *string_obj);
 
-extern uint64_t bt_value_array_get_size(const bt_value *array_obj);
+extern uint64_t bt_value_array_get_length(const bt_value *array_obj);
 
 static inline
 bt_bool bt_value_array_is_empty(const bt_value *array_obj)
 {
-       return bt_value_array_get_size(array_obj) == 0;
+       return bt_value_array_get_length(array_obj) == 0;
 }
 
 extern const bt_value *bt_value_array_borrow_element_by_index_const(
@@ -159,9 +159,8 @@ typedef bt_bool (* bt_value_map_foreach_entry_const_func)(const char *key,
                const bt_value *object, void *data);
 
 typedef enum bt_value_map_foreach_entry_const_status {
-       BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_MEMORY_ERROR    = __BT_FUNC_STATUS_MEMORY_ERROR,
        BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_OK              = __BT_FUNC_STATUS_OK,
-       BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_CANCELED        = __BT_FUNC_STATUS_CANCELED,
+       BT_VALUE_MAP_FOREACH_ENTRY_CONST_STATUS_INTERRUPTED     = __BT_FUNC_STATUS_INTERRUPTED,
 } bt_value_map_foreach_entry_const_status;
 
 extern bt_value_map_foreach_entry_const_status bt_value_map_foreach_entry_const(
@@ -171,16 +170,6 @@ extern bt_value_map_foreach_entry_const_status bt_value_map_foreach_entry_const(
 extern bt_bool bt_value_map_has_entry(const bt_value *map_obj,
                const char *key);
 
-typedef enum bt_value_map_extend_status {
-       BT_VALUE_MAP_EXTEND_STATUS_MEMORY_ERROR = __BT_FUNC_STATUS_MEMORY_ERROR,
-       BT_VALUE_MAP_EXTEND_STATUS_OK           = __BT_FUNC_STATUS_OK,
-} bt_value_map_extend_status;
-
-extern bt_value_map_extend_status bt_value_map_extend(
-               const bt_value *base_map_obj,
-               const bt_value *extension_map_obj,
-               bt_value **extended_map_obj);
-
 extern void bt_value_get_ref(const bt_value *value);
 
 extern void bt_value_put_ref(const bt_value *value);