X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fvalues.c;h=bd217bf61ce5fa8f1cc6ad577ae3cb0f2ad96d3a;hb=95fb061d540557dcde8d66671fe842cf096cd1f5;hp=5778528b4e0f3f1bdf9b60107dc63b85d0e418bd;hpb=83509119a945fc77faff869daaf48627e1c4b3fa;p=babeltrace.git

diff --git a/lib/values.c b/lib/values.c
index 5778528b..bd217bf6 100644
--- a/lib/values.c
+++ b/lib/values.c
@@ -33,7 +33,7 @@
 #include <babeltrace/object-internal.h>
 #include <babeltrace/ref.h>
 #include <babeltrace/values.h>
-#include <glib.h>
+#include <babeltrace/compat/glib.h>
 
 #define BT_VALUE_FROM_CONCRETE(_concrete) ((struct bt_value *) (_concrete))
 #define BT_VALUE_TO_BOOL(_base) ((struct bt_value_bool *) (_base))
@@ -226,7 +226,7 @@ struct bt_value *bt_value_map_copy(const struct bt_value *map_obj)
 	g_hash_table_iter_init(&iter, typed_map_obj->ght);
 
 	while (g_hash_table_iter_next(&iter, &key, &element_obj)) {
-		const char *key_str = g_quark_to_string((unsigned long) key);
+		const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key));
 
 		element_obj_copy = bt_value_copy(element_obj);
 
@@ -357,7 +357,7 @@ bool bt_value_map_compare(const struct bt_value *object_a,
 
 	while (g_hash_table_iter_next(&iter, &key, &element_obj_a)) {
 		struct bt_value *element_obj_b;
-		const char *key_str = g_quark_to_string((unsigned long) key);
+		const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key));
 
 		element_obj_b = bt_value_map_get(object_b, key_str);
 
@@ -606,7 +606,7 @@ struct bt_value *bt_value_array_create(void)
 	}
 
 	array_obj->base = bt_value_create_base(BT_VALUE_TYPE_ARRAY);
-	array_obj->garray = g_ptr_array_new_full(0,
+	array_obj->garray = bt_g_ptr_array_new_full(0,
 		(GDestroyNotify) bt_put);
 
 	if (!array_obj->garray) {
@@ -644,7 +644,7 @@ end:
 }
 
 enum bt_value_status bt_value_bool_get(const struct bt_value *bool_obj,
-	bool *val)
+		bool *val)
 {
 	enum bt_value_status ret = BT_VALUE_STATUS_OK;
 	struct bt_value_bool *typed_bool_obj = BT_VALUE_TO_BOOL(bool_obj);
@@ -682,7 +682,7 @@ end:
 }
 
 enum bt_value_status bt_value_integer_get(const struct bt_value *integer_obj,
-	int64_t *val)
+		int64_t *val)
 {
 	enum bt_value_status ret = BT_VALUE_STATUS_OK;
 	struct bt_value_integer *typed_integer_obj =
@@ -700,7 +700,7 @@ end:
 }
 
 enum bt_value_status bt_value_integer_set(struct bt_value *integer_obj,
-	int64_t val)
+		int64_t val)
 {
 	enum bt_value_status ret = BT_VALUE_STATUS_OK;
 	struct bt_value_integer *typed_integer_obj =
@@ -723,7 +723,7 @@ end:
 }
 
 enum bt_value_status bt_value_float_get(const struct bt_value *float_obj,
-	double *val)
+		double *val)
 {
 	enum bt_value_status ret = BT_VALUE_STATUS_OK;
 	struct bt_value_float *typed_float_obj =
@@ -741,7 +741,7 @@ end:
 }
 
 enum bt_value_status bt_value_float_set(struct bt_value *float_obj,
-	double val)
+		double val)
 {
 	enum bt_value_status ret = BT_VALUE_STATUS_OK;
 	struct bt_value_float *typed_float_obj =
@@ -764,7 +764,7 @@ end:
 }
 
 enum bt_value_status bt_value_string_get(const struct bt_value *string_obj,
-	const char **val)
+		const char **val)
 {
 	enum bt_value_status ret = BT_VALUE_STATUS_OK;
 	struct bt_value_string *typed_string_obj =
@@ -782,7 +782,7 @@ end:
 }
 
 enum bt_value_status bt_value_string_set(struct bt_value *string_obj,
-	const char *val)
+		const char *val)
 {
 	enum bt_value_status ret = BT_VALUE_STATUS_OK;
 	struct bt_value_string *typed_string_obj =
@@ -827,7 +827,7 @@ bool bt_value_array_is_empty(const struct bt_value *array_obj)
 }
 
 struct bt_value *bt_value_array_get(const struct bt_value *array_obj,
-	size_t index)
+		size_t index)
 {
 	struct bt_value *ret;
 	struct bt_value_array *typed_array_obj =
@@ -847,7 +847,7 @@ end:
 }
 
 enum bt_value_status bt_value_array_append(struct bt_value *array_obj,
-	struct bt_value *element_obj)
+		struct bt_value *element_obj)
 {
 	enum bt_value_status ret = BT_VALUE_STATUS_OK;
 	struct bt_value_array *typed_array_obj =
@@ -871,7 +871,7 @@ end:
 }
 
 enum bt_value_status bt_value_array_append_bool(struct bt_value *array_obj,
-	bool val)
+		bool val)
 {
 	enum bt_value_status ret;
 	struct bt_value *bool_obj = NULL;
@@ -884,7 +884,7 @@ enum bt_value_status bt_value_array_append_bool(struct bt_value *array_obj,
 }
 
 enum bt_value_status bt_value_array_append_integer(
-	struct bt_value *array_obj, int64_t val)
+		struct bt_value *array_obj, int64_t val)
 {
 	enum bt_value_status ret;
 	struct bt_value *integer_obj = NULL;
@@ -897,7 +897,7 @@ enum bt_value_status bt_value_array_append_integer(
 }
 
 enum bt_value_status bt_value_array_append_float(struct bt_value *array_obj,
-	double val)
+		double val)
 {
 	enum bt_value_status ret;
 	struct bt_value *float_obj = NULL;
@@ -910,7 +910,7 @@ enum bt_value_status bt_value_array_append_float(struct bt_value *array_obj,
 }
 
 enum bt_value_status bt_value_array_append_string(struct bt_value *array_obj,
-	const char *val)
+		const char *val)
 {
 	enum bt_value_status ret;
 	struct bt_value *string_obj = NULL;
@@ -922,7 +922,8 @@ enum bt_value_status bt_value_array_append_string(struct bt_value *array_obj,
 	return ret;
 }
 
-enum bt_value_status bt_value_array_append_array(struct bt_value *array_obj)
+enum bt_value_status bt_value_array_append_empty_array(
+		struct bt_value *array_obj)
 {
 	enum bt_value_status ret;
 	struct bt_value *empty_array_obj = NULL;
@@ -934,7 +935,7 @@ enum bt_value_status bt_value_array_append_array(struct bt_value *array_obj)
 	return ret;
 }
 
-enum bt_value_status bt_value_array_append_map(struct bt_value *array_obj)
+enum bt_value_status bt_value_array_append_empty_map(struct bt_value *array_obj)
 {
 	enum bt_value_status ret;
 	struct bt_value *map_obj = NULL;
@@ -947,7 +948,7 @@ enum bt_value_status bt_value_array_append_map(struct bt_value *array_obj)
 }
 
 enum bt_value_status bt_value_array_set(struct bt_value *array_obj,
-	size_t index, struct bt_value *element_obj)
+		size_t index, struct bt_value *element_obj)
 {
 	enum bt_value_status ret = BT_VALUE_STATUS_OK;
 	struct bt_value_array *typed_array_obj =
@@ -994,7 +995,7 @@ bool bt_value_map_is_empty(const struct bt_value *map_obj)
 }
 
 struct bt_value *bt_value_map_get(const struct bt_value *map_obj,
-	const char *key)
+		const char *key)
 {
 	GQuark quark;
 	struct bt_value *ret;
@@ -1028,7 +1029,7 @@ bool bt_value_map_has_key(const struct bt_value *map_obj, const char *key)
 	}
 
 	quark = g_quark_from_string(key);
-	ret = g_hash_table_contains(typed_map_obj->ght,
+	ret = bt_g_hash_table_contains(typed_map_obj->ght,
 		GUINT_TO_POINTER(quark));
 
 end:
@@ -1036,7 +1037,7 @@ end:
 }
 
 enum bt_value_status bt_value_map_insert(struct bt_value *map_obj,
-	const char *key, struct bt_value *element_obj)
+		const char *key, struct bt_value *element_obj)
 {
 	GQuark quark;
 	enum bt_value_status ret = BT_VALUE_STATUS_OK;
@@ -1062,7 +1063,7 @@ end:
 }
 
 enum bt_value_status bt_value_map_insert_bool(struct bt_value *map_obj,
-	const char *key, bool val)
+		const char *key, bool val)
 {
 	enum bt_value_status ret;
 	struct bt_value *bool_obj = NULL;
@@ -1075,7 +1076,7 @@ enum bt_value_status bt_value_map_insert_bool(struct bt_value *map_obj,
 }
 
 enum bt_value_status bt_value_map_insert_integer(struct bt_value *map_obj,
-	const char *key, int64_t val)
+		const char *key, int64_t val)
 {
 	enum bt_value_status ret;
 	struct bt_value *integer_obj = NULL;
@@ -1088,7 +1089,7 @@ enum bt_value_status bt_value_map_insert_integer(struct bt_value *map_obj,
 }
 
 enum bt_value_status bt_value_map_insert_float(struct bt_value *map_obj,
-	const char *key, double val)
+		const char *key, double val)
 {
 	enum bt_value_status ret;
 	struct bt_value *float_obj = NULL;
@@ -1101,7 +1102,7 @@ enum bt_value_status bt_value_map_insert_float(struct bt_value *map_obj,
 }
 
 enum bt_value_status bt_value_map_insert_string(struct bt_value *map_obj,
-	const char *key, const char *val)
+		const char *key, const char *val)
 {
 	enum bt_value_status ret;
 	struct bt_value *string_obj = NULL;
@@ -1113,8 +1114,8 @@ enum bt_value_status bt_value_map_insert_string(struct bt_value *map_obj,
 	return ret;
 }
 
-enum bt_value_status bt_value_map_insert_array(struct bt_value *map_obj,
-	const char *key)
+enum bt_value_status bt_value_map_insert_empty_array(struct bt_value *map_obj,
+		const char *key)
 {
 	enum bt_value_status ret;
 	struct bt_value *array_obj = NULL;
@@ -1126,8 +1127,8 @@ enum bt_value_status bt_value_map_insert_array(struct bt_value *map_obj,
 	return ret;
 }
 
-enum bt_value_status bt_value_map_insert_map(struct bt_value *map_obj,
-	const char *key)
+enum bt_value_status bt_value_map_insert_empty_map(struct bt_value *map_obj,
+		const char *key)
 {
 	enum bt_value_status ret;
 	struct bt_value *empty_map_obj = NULL;
@@ -1140,7 +1141,7 @@ enum bt_value_status bt_value_map_insert_map(struct bt_value *map_obj,
 }
 
 enum bt_value_status bt_value_map_foreach(const struct bt_value *map_obj,
-	bt_value_map_foreach_cb cb, void *data)
+		bt_value_map_foreach_cb cb, void *data)
 {
 	enum bt_value_status ret = BT_VALUE_STATUS_OK;
 	gpointer key, element_obj;
@@ -1155,7 +1156,7 @@ enum bt_value_status bt_value_map_foreach(const struct bt_value *map_obj,
 	g_hash_table_iter_init(&iter, typed_map_obj->ght);
 
 	while (g_hash_table_iter_next(&iter, &key, &element_obj)) {
-		const char *key_str = g_quark_to_string((unsigned long) key);
+		const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key));
 
 		if (!cb(key_str, element_obj, data)) {
 			ret = BT_VALUE_STATUS_CANCELLED;