projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use g_simple_async_result_{new_,}take_error
[platform/upstream/glib.git]
/
gio
/
gunixoutputstream.c
diff --git
a/gio/gunixoutputstream.c
b/gio/gunixoutputstream.c
index
0d43c66
..
5bc1918
100644
(file)
--- a/
gio/gunixoutputstream.c
+++ b/
gio/gunixoutputstream.c
@@
-449,10
+449,7
@@
write_async_cb (WriteAsyncData *data,
g_simple_async_result_set_op_res_gssize (simple, count_written);
if (count_written == -1)
g_simple_async_result_set_op_res_gssize (simple, count_written);
if (count_written == -1)
- {
- g_simple_async_result_set_from_error (simple, error);
- g_error_free (error);
- }
+ g_simple_async_result_take_error (simple, error);
/* Complete immediately, not in idle, since we're already in a mainloop callout */
g_simple_async_result_complete (simple);
/* Complete immediately, not in idle, since we're already in a mainloop callout */
g_simple_async_result_complete (simple);
@@
-557,10
+554,7
@@
close_async_cb (CloseAsyncData *data)
g_unix_output_stream_close_async);
if (!result)
g_unix_output_stream_close_async);
if (!result)
- {
- g_simple_async_result_set_from_error (simple, error);
- g_error_free (error);
- }
+ g_simple_async_result_take_error (simple, error);
/* Complete immediately, not in idle, since we're already in a mainloop callout */
g_simple_async_result_complete (simple);
/* Complete immediately, not in idle, since we're already in a mainloop callout */
g_simple_async_result_complete (simple);