luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-11-04 10:08:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1401-g_clear_handle_id-clear_func-not-nullable' into 'master'

Browse Source 
g_clear_handle_id: don't accept NULL clear_func

Closes #1401

See merge request GNOME/glib!55

(cherry picked from commit 95ebaa26aa)

0f7c196c g_clear_handle_id: don't accept NULL clear_func
This commit is contained in:
Philip Withnall
2018-06-04 13:41:10 +00:00
parent 69dec2db49
commit cfa28e152b
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
glib/gmain.c
View File

@@ -2437,8 +2437,7 @@ g_clear_handle_id (guint *tag_ptr,
if (_handle_id > 0) if (_handle_id > 0)
{ {
*tag_ptr = 0; *tag_ptr = 0;
if (clear_func != NULL) clear_func (_handle_id);
clear_func (_handle_id);
} }
} }

3
glib/gmain.h
View File

@@ -590,8 +590,7 @@ void g_clear_handle_id (guint *tag_ptr,
if (_handle_id > 0) \ if (_handle_id > 0) \
{ \ { \
*_tag_ptr = 0; \ *_tag_ptr = 0; \
if (clear_func != NULL) \ clear_func (_handle_id); \
clear_func (_handle_id); \
} \ } \
} G_STMT_END } G_STMT_END