diff options
author | Matthias Clasen <mclasen@redhat.com> | 2007-12-31 05:25:25 +0000 |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2007-12-31 05:25:25 +0000 |
commit | de08b57f026bccb5e193f8bb4a6341ce48c60b40 (patch) | |
tree | 3e596850b3ef40fde13f2b2d6370369f294425a2 | |
parent | 227ef243b14c252bf1f3d7fa1dcd00bcf4f2ef84 (diff) |
Mark assertion functions as G_GNUC_NORETURN. (#506461, Sebastian Dröge)
2007-12-24 Matthias Clasen <mclasen@redhat.com>
* glib/gtestutils.h:
* glib/glib.symbols: Mark assertion functions as G_GNUC_NORETURN.
(#506461, Sebastian Dröge)
svn path=/trunk/; revision=6221
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | glib/glib.symbols | 8 | ||||
-rw-r--r-- | glib/gtestutils.h | 8 |
3 files changed, 14 insertions, 8 deletions
@@ -1,5 +1,11 @@ 2007-12-24 Matthias Clasen <mclasen@redhat.com> + * glib/gtestutils.h: + * glib/glib.symbols: Mark assertion functions as G_GNUC_NORETURN. + (#506461, Sebastian Dröge) + +2007-12-24 Matthias Clasen <mclasen@redhat.com> + * glib/gtestutils.c: Include sys/time.h. (#505258) 2007-12-22 Mathias Hasselmann <mathias@openismus.com> diff --git a/glib/glib.symbols b/glib/glib.symbols index 2b10f366d..9e8f76173 100644 --- a/glib/glib.symbols +++ b/glib/glib.symbols @@ -1278,10 +1278,10 @@ g_thread_pool_set_sort_function #if IN_HEADER(__G_TEST_UTILS_H__) #if IN_FILE(__G_TEST_UTILS_C__) -g_assertion_message -g_assertion_message_cmpnum -g_assertion_message_cmpstr -g_assertion_message_expr +g_assertion_message G_GNUC_NORETURN +g_assertion_message_cmpnum G_GNUC_NORETURN +g_assertion_message_cmpstr G_GNUC_NORETURN +g_assertion_message_expr G_GNUC_NORETURN g_strcmp0 g_test_add_data_func g_test_add_func diff --git a/glib/gtestutils.h b/glib/gtestutils.h index 8646a8951..f93a0a46e 100644 --- a/glib/gtestutils.h +++ b/glib/gtestutils.h @@ -166,12 +166,12 @@ void g_assertion_message (const char *domain, const char *file, int line, const char *func, - const char *message); + const char *message) G_GNUC_NORETURN; void g_assertion_message_expr (const char *domain, const char *file, int line, const char *func, - const char *expr); + const char *expr) G_GNUC_NORETURN; void g_assertion_message_cmpstr (const char *domain, const char *file, int line, @@ -179,7 +179,7 @@ void g_assertion_message_cmpstr (const char *domain, const char *expr, const char *arg1, const char *cmp, - const char *arg2); + const char *arg2) G_GNUC_NORETURN; void g_assertion_message_cmpnum (const char *domain, const char *file, int line, @@ -188,7 +188,7 @@ void g_assertion_message_cmpnum (const char *domain, long double arg1, const char *cmp, long double arg2, - char numtype); + char numtype) G_GNUC_NORETURN; void g_test_add_vtable (const char *testpath, gsize data_size, gconstpointer test_data, |