X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fvalues.h;h=85a838e8482125d28e077631f9e59aaa4b058737;hp=f6a9de549f68ec6a8a8ce6be35196ecf5bff029c;hb=40f4ba76dd6f9508ca51b6220eaed57632281a07;hpb=05e2128659970c32648a01255ed870449f05d518

diff --git a/include/babeltrace/values.h b/include/babeltrace/values.h
index f6a9de54..85a838e8 100644
--- a/include/babeltrace/values.h
+++ b/include/babeltrace/values.h
@@ -30,44 +30,13 @@
 /* For bt_bool */
 #include <babeltrace/types.h>
 
+/* For enum bt_value_status, enum bt_value_type */
+#include <babeltrace/values-const.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-enum bt_value_status {
-	/// Operation canceled.
-	BT_VALUE_STATUS_CANCELED	= 125,
-
-	/// Cannot allocate memory.
-	BT_VALUE_STATUS_NOMEM		= -12,
-
-	/// Okay, no error.
-	BT_VALUE_STATUS_OK		= 0,
-};
-
-enum bt_value_type {
-	/// Null value object.
-	BT_VALUE_TYPE_NULL =		0,
-
-	/// Boolean value object (holds #BT_TRUE or #BT_FALSE).
-	BT_VALUE_TYPE_BOOL =		1,
-
-	/// Integer value object (holds a signed 64-bit integer raw value).
-	BT_VALUE_TYPE_INTEGER =		2,
-
-	/// Floating point number value object (holds a \c double raw value).
-	BT_VALUE_TYPE_REAL =		3,
-
-	/// String value object.
-	BT_VALUE_TYPE_STRING =		4,
-
-	/// Array value object.
-	BT_VALUE_TYPE_ARRAY =		5,
-
-	/// Map value object.
-	BT_VALUE_TYPE_MAP =		6,
-};
-
 struct bt_value;
 
 extern struct bt_value *bt_value_null;
@@ -134,12 +103,12 @@ extern struct bt_value *bt_value_map_create(void);
 extern struct bt_value *bt_value_map_borrow_entry_value(
 		struct bt_value *map_obj, const char *key);
 
-typedef bt_bool (* bt_value_map_foreach_entry_cb)(const char *key,
+typedef bt_bool (* bt_value_map_foreach_entry_func)(const char *key,
 		struct bt_value *object, void *data);
 
 extern enum bt_value_status bt_value_map_foreach_entry(
 		struct bt_value *map_obj,
-		bt_value_map_foreach_entry_cb cb, void *data);
+		bt_value_map_foreach_entry_func func, void *data);
 
 extern enum bt_value_status bt_value_map_insert_entry(
 		struct bt_value *map_obj, const char *key,