projects
/
platform
/
upstream
/
evolution-data-server.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
781f53b
)
CamelStreamFs: Check for cancellation before closing or flushing
author
Matthew Barnes
<mbarnes@redhat.com>
Mon, 10 Jan 2011 22:42:24 +0000
(17:42 -0500)
committer
Matthew Barnes
<mbarnes@redhat.com>
Mon, 10 Jan 2011 22:46:06 +0000
(17:46 -0500)
camel/camel-stream-fs.c
patch
|
blob
|
history
diff --git
a/camel/camel-stream-fs.c
b/camel/camel-stream-fs.c
index
1c577c7
..
23eebea
100644
(file)
--- a/
camel/camel-stream-fs.c
+++ b/
camel/camel-stream-fs.c
@@
-124,6
+124,9
@@
stream_fs_flush (CamelStream *stream,
priv = CAMEL_STREAM_FS_GET_PRIVATE (stream);
+ if (g_cancellable_set_error_if_cancelled (cancellable, error))
+ return -1;
+
if (fsync (priv->fd) == -1) {
g_set_error (
error, G_IO_ERROR,
@@
-144,6
+147,9
@@
stream_fs_close (CamelStream *stream,
priv = CAMEL_STREAM_FS_GET_PRIVATE (stream);
+ if (g_cancellable_set_error_if_cancelled (cancellable, error))
+ return -1;
+
if (close (priv->fd) == -1) {
g_set_error (
error, G_IO_ERROR,