diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-10-12 11:05:04 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-10-12 11:14:33 +0200 |
| commit | 6f06ec0aba97c5dd89ffbe0f3592f3979d86d223 (patch) | |
| tree | b55d234f3876649bddf3aaeb2b4003c4d2e75fa5 | |
| parent | 23313d711ff7a328e96d1bc2da084bcb6266b3f0 (diff) | |
| download | NetworkManager-6f06ec0aba97c5dd89ffbe0f3592f3979d86d223.tar.gz | |
macros: remove early return from nm_clear_g_signal_handler()
It is valid to call nm_clear_g_signal_handler() with missing
@self argument if (and only if) the @id is unspecified as well.
Remove the check for @self to get an assertion in case @id
is missing *and* @self is invalid. In this case,
g_signal_handler_disconnect() will raise a g_critical() for us.
Fixes: c33416178f88353b2f424a18c576de09b6ae3215
(cherry picked from commit 76958f94d4f7a8536dc6fa8676bd8de31bc661c1)
| -rw-r--r-- | include/nm-macros-internal.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/nm-macros-internal.h b/include/nm-macros-internal.h index 4d9979f3f5..3c5adcc1cf 100644 --- a/include/nm-macros-internal.h +++ b/include/nm-macros-internal.h @@ -260,9 +260,6 @@ nm_clear_g_source (guint *id) static inline gboolean nm_clear_g_signal_handler (gpointer self, guint *id) { - if (!self) - return FALSE; - if (id && *id) { g_signal_handler_disconnect (self, *id); *id = 0; |