luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 23:58:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

gobject: simplify code in g_object_notify_by_spec_internal()

Browse Source 
Instead of deeper nesting ifs, return early at the various places
where we determine there is nothing to do.
This commit is contained in:
Thomas Haller
2025-02-28 10:20:49 +01:00
parent a2da296230
commit c5a6a21071
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gobject/gobject.c
View File

@@ -2022,34 +2022,35 @@ g_object_notify_by_spec_internal (GObject *object,
/* get all flags we need with a single atomic read */ /* get all flags we need with a single atomic read */
object_flags = object_get_optional_flags (object); object_flags = object_get_optional_flags (object);
needs_notify = ((object_flags & OPTIONAL_FLAG_HAS_NOTIFY_HANDLER) != 0) || needs_notify = ((object_flags & OPTIONAL_FLAG_HAS_NOTIFY_HANDLER) != 0) ||
CLASS_NEEDS_NOTIFY (G_OBJECT_GET_CLASS (object)); CLASS_NEEDS_NOTIFY (G_OBJECT_GET_CLASS (object));
if (!needs_notify)
return;
in_init = (object_flags & OPTIONAL_FLAG_IN_CONSTRUCTION) != 0; in_init = (object_flags & OPTIONAL_FLAG_IN_CONSTRUCTION) != 0;
if (pspec != NULL && needs_notify) if (g_object_notify_queue_add (object, pspec, in_init))
{ return;
if (!g_object_notify_queue_add (object, pspec, in_init))
{ /*
/* * Coverity doesn’t understand the paired ref/unref here and seems to
* Coverity doesn’t understand the paired ref/unref here and seems to * ignore the ref, thus reports every call to g_object_notify() as
* ignore the ref, thus reports every call to g_object_notify() as * causing a double-free. That’s incorrect, but I can’t get a model
* causing a double-free. That’s incorrect, but I can’t get a model * file to work for avoiding the false positives, so instead comment
* file to work for avoiding the false positives, so instead comment * out the ref/unref when doing static analysis.
* out the ref/unref when doing static analysis. */
*/
#ifndef __COVERITY__ #ifndef __COVERITY__
g_object_ref (object); g_object_ref (object);
#endif #endif
/* not frozen, so just dispatch the notification directly */ /* not frozen, so just dispatch the notification directly */
G_OBJECT_GET_CLASS (object) G_OBJECT_GET_CLASS (object)->dispatch_properties_changed (object, 1, &pspec);
->dispatch_properties_changed (object, 1, &pspec);
#ifndef __COVERITY__ #ifndef __COVERITY__
g_object_unref (object); g_object_unref (object);
#endif #endif
}
}
} }
/** /**