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

gio: add g_async_result_is_tagged()

Browse Source 
Rather than doing a two step first-check-the-GAsyncResult-subtype-then-
check-the-tag, add a GAsyncResult-level method so that you can do them
both at once, simplifying the code for "short-circuit" async return
values where the vmethod never gets called.

https://bugzilla.gnome.org/show_bug.cgi?id=661767
This commit is contained in:
Dan Winship
2012-05-10 11:09:52 -04:00
parent f8532a13e2
commit 82d914d808
11 changed files with 69 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gio/ginputstream.c
View File

@@ -649,7 +649,6 @@ g_input_stream_read_finish (GInputStream *stream,
GAsyncResult *result,
GError **error)
{
GSimpleAsyncResult *simple;
GInputStreamClass *class;
g_return_val_if_fail (G_IS_INPUT_STREAM (stream), -1);
@@ -657,14 +656,10 @@ g_input_stream_read_finish (GInputStream *stream,
if (g_async_result_legacy_propagate_error (result, error))
return -1;
if (G_IS_SIMPLE_ASYNC_RESULT (result))
else if (g_async_result_is_tagged (result, g_input_stream_read_async))
{
simple = G_SIMPLE_ASYNC_RESULT (result);
/* Special case read of 0 bytes */
if (g_simple_async_result_get_source_tag (simple) == g_input_stream_read_async)
return 0;
return 0;
}
class = G_INPUT_STREAM_GET_CLASS (stream);
@@ -889,7 +884,6 @@ g_input_stream_skip_finish (GInputStream *stream,
GAsyncResult *result,
GError **error)
{
GSimpleAsyncResult *simple;
GInputStreamClass *class;
g_return_val_if_fail (G_IS_INPUT_STREAM (stream), -1);
@@ -897,14 +891,10 @@ g_input_stream_skip_finish (GInputStream *stream,
if (g_async_result_legacy_propagate_error (result, error))
return -1;
if (G_IS_SIMPLE_ASYNC_RESULT (result))
else if (g_async_result_is_tagged (result, g_input_stream_skip_async))
{
simple = G_SIMPLE_ASYNC_RESULT (result);
/* Special case skip of 0 bytes */
if (g_simple_async_result_get_source_tag (simple) == g_input_stream_skip_async)
return 0;
return 0;
}
class = G_INPUT_STREAM_GET_CLASS (stream);
@@ -988,7 +978,6 @@ g_input_stream_close_finish (GInputStream *stream,
GAsyncResult *result,
GError **error)
{
GSimpleAsyncResult *simple;
GInputStreamClass *class;
g_return_val_if_fail (G_IS_INPUT_STREAM (stream), FALSE);
@@ -996,14 +985,10 @@ g_input_stream_close_finish (GInputStream *stream,
if (g_async_result_legacy_propagate_error (result, error))
return FALSE;
if (G_IS_SIMPLE_ASYNC_RESULT (result))
else if (g_async_result_is_tagged (result, g_input_stream_close_async))
{
simple = G_SIMPLE_ASYNC_RESULT (result);
/* Special case already closed */
if (g_simple_async_result_get_source_tag (simple) == g_input_stream_close_async)
return TRUE;
return TRUE;
}
class = G_INPUT_STREAM_GET_CLASS (stream);