From de08b57f026bccb5e193f8bb4a6341ce48c60b40 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 31 Dec 2007 05:25:25 +0000 Subject: [PATCH] =?utf8?q?Mark=20assertion=20functions=20as=20G=5FGNUC=5FN?= =?utf8?q?ORETURN.=20(#506461,=20Sebastian=20Dr=C3=B6ge)?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2007-12-24 Matthias Clasen * glib/gtestutils.h: * glib/glib.symbols: Mark assertion functions as G_GNUC_NORETURN. (#506461, Sebastian Dröge) svn path=/trunk/; revision=6221 --- ChangeLog | 6 ++++++ glib/glib.symbols | 8 ++++---- glib/gtestutils.h | 8 ++++---- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 678e026..24e940e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2007-12-24 Matthias Clasen + * glib/gtestutils.h: + * glib/glib.symbols: Mark assertion functions as G_GNUC_NORETURN. + (#506461, Sebastian Dröge) + +2007-12-24 Matthias Clasen + * glib/gtestutils.c: Include sys/time.h. (#505258) 2007-12-22 Mathias Hasselmann diff --git a/glib/glib.symbols b/glib/glib.symbols index 2b10f36..9e8f761 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 8646a89..f93a0a4 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, -- 2.7.4