mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-08-02 07:23:41 +02:00
2007-12-10 15:08:59 Tim Janik <timj@imendio.com> * let g_warn_if_fail replace g_assert as discussed here: http://mail.gnome.org/archives/gtk-devel-list/2007-October/msg00089.html * fix bug #502498: Test framework assertion failures should follow gcc error format. * gmessages.h, gmessages.c: deprecated g_assert_warning() which is unused now. removed g_assert*() definitions whcih are provided by gtestutils.h now. added g_warn_if_reached() and g_warn_if_fail() which are recommended as g_assert/g_assert_not_reached replacements for non-test programs. added g_warn_message() to implement g_warn_*() macros. use emacs-next-error friendly formatting for file:line: for warnings. * gtestutils.h, gtestutils.c: use emacs-next-error friendly formatting. implement g_assert_not_reached() with g_assertion_message() and g_assert() in terms of g_assertion_message_expr() so we'll be able to provide assertion messages in test logs. * gkeyfile.c, gbookmarkfile.c: changed g_assert*() to g_warn_if_fail() or g_return_if_fail() where suitable. * gio/: changed g_assert to g_warn_if_fail. svn path=/trunk/; revision=6086
This commit is contained in:
committed by
Tim Janik
parent
0dbfa89ba1
commit
cc3de68e21
@@ -83,13 +83,13 @@ g_local_file_monitor_constructor (GType type,
|
||||
{
|
||||
if (strcmp ("filename", g_param_spec_get_name (construct_properties[i].pspec)) == 0)
|
||||
{
|
||||
g_assert (G_VALUE_HOLDS_STRING (construct_properties[i].value));
|
||||
g_warn_if_fail (G_VALUE_HOLDS_STRING (construct_properties[i].value));
|
||||
filename = g_value_get_string (construct_properties[i].value);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
g_assert (filename != NULL);
|
||||
g_warn_if_fail (filename != NULL);
|
||||
|
||||
local_monitor->filename = g_strdup (filename);
|
||||
return obj;
|
||||
|
Reference in New Issue
Block a user