X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace2%2Fvalue-const.h;h=f9a1d3d093cad57badc49151f8a4fc083e889f4b;hb=8d8b141db4c46135a35be19e4a1c192f6a36d67b;hp=f443a75597a777064fd0508919299e731291f28e;hpb=4fa90f321f51af8f5bfc48eee1435e2f41d853b3;p=babeltrace.git

diff --git a/include/babeltrace2/value-const.h b/include/babeltrace2/value-const.h
index f443a755..f9a1d3d0 100644
--- a/include/babeltrace2/value-const.h
+++ b/include/babeltrace2/value-const.h
@@ -2,7 +2,7 @@
 #define BABELTRACE2_VALUE_CONST_H
 
 /*
- * Copyright (c) 2015-2018 Philippe Proulx <pproulx@efficios.com>
+ * Copyright (c) 2010-2019 EfficiOS Inc. and Linux Foundation
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -30,7 +30,6 @@
 #include <stdint.h>
 #include <stddef.h>
 
-/* For bt_bool, bt_value */
 #include <babeltrace2/types.h>
 
 #ifdef __cplusplus
@@ -126,20 +125,20 @@ extern bt_bool bt_value_compare(const bt_value *object_a,
 
 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(
@@ -162,7 +161,7 @@ typedef bt_bool (* bt_value_map_foreach_entry_const_func)(const char *key,
 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(