diff options
author | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2022-12-20 02:20:17 +0100 |
---|---|---|
committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2022-12-20 17:48:21 +0100 |
commit | cbb9feb6afae66cb3f40fc5009e4124d9aeff32b (patch) | |
tree | 33f81ed7a6a4ca3df9a04af97e671152dce36830 /gobject | |
parent | bc59ed8fba0f171399967e692153e72ac911b7d0 (diff) | |
download | glib-cbb9feb6afae66cb3f40fc5009e4124d9aeff32b.tar.gz |
gobject: Use some new cleaner code to set object GValues
Use some newer APIs to make the code nicer cleaner and clearer in terms of
memory ownership.
Diffstat (limited to 'gobject')
-rw-r--r-- | gobject/gobject.c | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/gobject/gobject.c b/gobject/gobject.c index 5a3b70b5f..19ed1a866 100644 --- a/gobject/gobject.c +++ b/gobject/gobject.c @@ -4396,18 +4396,15 @@ g_value_object_init (GValue *value) static void g_value_object_free_value (GValue *value) { - if (value->data[0].v_pointer) - g_object_unref (value->data[0].v_pointer); + g_clear_object ((GObject**) &value->data[0].v_pointer); } static void g_value_object_copy_value (const GValue *src_value, GValue *dest_value) { - if (src_value->data[0].v_pointer) - dest_value->data[0].v_pointer = g_object_ref (src_value->data[0].v_pointer); - else - dest_value->data[0].v_pointer = NULL; + g_set_object ((GObject**) &dest_value->data[0].v_pointer, + src_value->data[0].v_pointer); } static void @@ -4499,27 +4496,23 @@ g_value_set_object (GValue *value, gpointer v_object) { GObject *old; - + g_return_if_fail (G_VALUE_HOLDS_OBJECT (value)); if G_UNLIKELY (value->data[0].v_pointer == v_object) return; - old = value->data[0].v_pointer; + old = g_steal_pointer (&value->data[0].v_pointer); if (v_object) { g_return_if_fail (G_IS_OBJECT (v_object)); g_return_if_fail (g_value_type_compatible (G_OBJECT_TYPE (v_object), G_VALUE_TYPE (value))); - value->data[0].v_pointer = v_object; - g_object_ref (value->data[0].v_pointer); + value->data[0].v_pointer = g_object_ref (v_object); } - else - value->data[0].v_pointer = NULL; - - if (old) - g_object_unref (old); + + g_clear_object (&old); } /** @@ -4559,18 +4552,14 @@ g_value_take_object (GValue *value, { g_return_if_fail (G_VALUE_HOLDS_OBJECT (value)); - if (value->data[0].v_pointer) - { - g_object_unref (value->data[0].v_pointer); - value->data[0].v_pointer = NULL; - } + g_clear_object ((GObject **) &value->data[0].v_pointer); if (v_object) { g_return_if_fail (G_IS_OBJECT (v_object)); g_return_if_fail (g_value_type_compatible (G_OBJECT_TYPE (v_object), G_VALUE_TYPE (value))); - value->data[0].v_pointer = v_object; /* we take over the reference count */ + value->data[0].v_pointer = g_steal_pointer (&v_object); } } |