luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

http://mail.gnome.org/archives/gtk-devel-list/2007-October/msg00089.html

Browse Source 
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:
15:08:59 Tim Janik
2007-12-10 14:07:42 +00:00
committed by Tim Janik
parent 0dbfa89ba1
commit cc3de68e21
31 changed files with 172 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gio/gfile.c
View File

@@ -3291,7 +3291,7 @@ g_file_real_query_info_finish (GFile *file,
GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
QueryInfoAsyncData *data;
g_assert (g_simple_async_result_get_source_tag (simple) == g_file_real_query_info_async);
g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_query_info_async);
data = g_simple_async_result_get_op_res_gpointer (simple);
if (data->info)
@@ -3368,7 +3368,7 @@ g_file_real_enumerate_children_finish (GFile *file,
GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
EnumerateChildrenAsyncData *data;
g_assert (g_simple_async_result_get_source_tag (simple) == g_file_real_enumerate_children_async);
g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_enumerate_children_async);
data = g_simple_async_result_get_op_res_gpointer (simple);
if (data->enumerator)
@@ -3422,7 +3422,7 @@ g_file_real_read_finish (GFile *file,
GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
gpointer op;
g_assert (g_simple_async_result_get_source_tag (simple) == g_file_real_read_async);
g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_read_async);
op = g_simple_async_result_get_op_res_gpointer (simple);
if (op)
@@ -3485,7 +3485,7 @@ g_file_real_append_to_finish (GFile *file,
GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
gpointer op;
g_assert (g_simple_async_result_get_source_tag (simple) == g_file_real_append_to_async);
g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_append_to_async);
op = g_simple_async_result_get_op_res_gpointer (simple);
if (op)
@@ -3548,7 +3548,7 @@ g_file_real_create_finish (GFile *file,
GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
gpointer op;
g_assert (g_simple_async_result_get_source_tag (simple) == g_file_real_create_async);
g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_create_async);
op = g_simple_async_result_get_op_res_gpointer (simple);
if (op)
@@ -3636,7 +3636,7 @@ g_file_real_replace_finish (GFile *file,
GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
ReplaceAsyncData *data;
g_assert (g_simple_async_result_get_source_tag (simple) == g_file_real_replace_async);
g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_replace_async);
data = g_simple_async_result_get_op_res_gpointer (simple);
if (data->stream)
@@ -3710,7 +3710,7 @@ g_file_real_set_display_name_finish (GFile *file,
GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
SetDisplayNameAsyncData *data;
g_assert (g_simple_async_result_get_source_tag (simple) == g_file_real_set_display_name_async);
g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_set_display_name_async);
data = g_simple_async_result_get_op_res_gpointer (simple);
if (data->file)
@@ -3785,7 +3785,7 @@ g_file_real_set_attributes_finish (GFile *file,
GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
SetInfoAsyncData *data;
g_assert (g_simple_async_result_get_source_tag (simple) == g_file_real_set_attributes_async);
g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_real_set_attributes_async);
data = g_simple_async_result_get_op_res_gpointer (simple);
@@ -4338,7 +4338,7 @@ g_file_load_partial_contents_finish (GFile *file,
if (g_simple_async_result_propagate_error (simple, error))
return FALSE;
g_assert (g_simple_async_result_get_source_tag (simple) == g_file_load_contents_async);
g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_load_contents_async);
data = g_simple_async_result_get_op_res_gpointer (simple);
@@ -4738,7 +4738,7 @@ g_file_replace_contents_finish (GFile *file,
if (g_simple_async_result_propagate_error (simple, error))
return FALSE;
g_assert (g_simple_async_result_get_source_tag (simple) == g_file_replace_contents_async);
g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == g_file_replace_contents_async);
data = g_simple_async_result_get_op_res_gpointer (simple);