From 5d5982ab885a99f596f9a998d1374f51149c1a20 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Wed, 14 Sep 2016 20:32:29 -0400 Subject: [PATCH] Cleanup: bt namespace for compat glib MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- include/babeltrace/compat/glib.h | 8 ++++---- lib/values.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/babeltrace/compat/glib.h b/include/babeltrace/compat/glib.h index a95d045b..dd03b19c 100644 --- a/include/babeltrace/compat/glib.h +++ b/include/babeltrace/compat/glib.h @@ -30,7 +30,7 @@ #if GLIB_CHECK_VERSION(2,31,8) static inline gboolean -babeltrace_g_hash_table_contains(GHashTable *hash_table, gconstpointer key) +bt_g_hash_table_contains(GHashTable *hash_table, gconstpointer key) { return g_hash_table_contains(hash_table, key); } @@ -38,7 +38,7 @@ babeltrace_g_hash_table_contains(GHashTable *hash_table, gconstpointer key) #else static inline gboolean -babeltrace_g_hash_table_contains(GHashTable *hash_table, gconstpointer key) +bt_g_hash_table_contains(GHashTable *hash_table, gconstpointer key) { const char *value; @@ -56,7 +56,7 @@ babeltrace_g_hash_table_contains(GHashTable *hash_table, gconstpointer key) #if GLIB_CHECK_VERSION(2,29,16) static inline GPtrArray * -babeltrace_g_ptr_array_new_full(guint reserved_size, +bt_g_ptr_array_new_full(guint reserved_size, GDestroyNotify element_free_func) { return g_ptr_array_new_full(reserved_size, element_free_func); @@ -65,7 +65,7 @@ babeltrace_g_ptr_array_new_full(guint reserved_size, #else static inline GPtrArray * -babeltrace_g_ptr_array_new_full(guint reserved_size, +bt_g_ptr_array_new_full(guint reserved_size, GDestroyNotify element_free_func) { GPtrArray *array; diff --git a/lib/values.c b/lib/values.c index 5c7803cd..bd217bf6 100644 --- a/lib/values.c +++ b/lib/values.c @@ -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 = babeltrace_g_ptr_array_new_full(0, + array_obj->garray = bt_g_ptr_array_new_full(0, (GDestroyNotify) bt_put); if (!array_obj->garray) { @@ -1029,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 = babeltrace_g_hash_table_contains(typed_map_obj->ght, + ret = bt_g_hash_table_contains(typed_map_obj->ght, GUINT_TO_POINTER(quark)); end: -- 2.34.1