2007-12-13 Alexander Larsson <alexl@redhat.com>
+ * gcancellable.[ch]:
+ * gio.symbols:
+ * gbufferedinputstream.c:
+ * gfileenumerator.c:
+ * gfileinputstream.c:
+ * gfileoutputstream.c:
+ * ginputstream.c:
+ * gioscheduler.c:
+ * goutputstream.c:
+ g_push/pop_current_cancellable ->
+ g_cancellable_push/pop_current
+
+2007-12-13 Alexander Larsson <alexl@redhat.com>
+
* gfile.[ch]:
* gio.symbols:
Rename g_mount_for_location to g_file_mount_enclosing_volume.
return -1;
if (cancellable)
- g_push_current_cancellable (cancellable);
+ g_cancellable_push_current (cancellable);
class = G_BUFFERED_INPUT_STREAM_GET_CLASS (stream);
res = class->fill (stream, count, cancellable, error);
if (cancellable)
- g_pop_current_cancellable (cancellable);
+ g_cancellable_pop_current (cancellable);
g_input_stream_clear_pending (input_stream);
/* Byte not available, request refill for more */
if (cancellable)
- g_push_current_cancellable (cancellable);
+ g_cancellable_push_current (cancellable);
priv->pos = 0;
priv->end = 0;
nread = class->fill (stream, priv->len, cancellable, error);
if (cancellable)
- g_pop_current_cancellable (cancellable);
+ g_cancellable_pop_current (cancellable);
g_input_stream_clear_pending (input_stream);
}
/**
- * g_push_current_cancellable:
+ * g_cancellable_push_current:
* @cancellable: optional #GCancellable object, %NULL to ignore.
*
* Pushes @cancellable onto the cancellable stack. The current
* so you rarely have to call this yourself.
**/
void
-g_push_current_cancellable (GCancellable *cancellable)
+g_cancellable_push_current (GCancellable *cancellable)
{
GSList *l;
}
/**
- * g_pop_current_cancellable:
+ * g_cancellable_pop_current:
* @cancellable: optional #GCancellable object, %NULL to ignore.
*
* Pops @cancellable off the cancellable stack (verifying that @cancellable
* is on the top of the stack).
**/
void
-g_pop_current_cancellable (GCancellable *cancellable)
+g_cancellable_pop_current (GCancellable *cancellable)
{
GSList *l;
GError **error);
int g_cancellable_get_fd (GCancellable *cancellable);
GCancellable *g_cancellable_get_current (void);
-void g_push_current_cancellable (GCancellable *cancellable);
-void g_pop_current_cancellable (GCancellable *cancellable);
+void g_cancellable_push_current (GCancellable *cancellable);
+void g_cancellable_pop_current (GCancellable *cancellable);
void g_cancellable_reset (GCancellable *cancellable);
class = G_FILE_ENUMERATOR_GET_CLASS (enumerator);
if (cancellable)
- g_push_current_cancellable (cancellable);
+ g_cancellable_push_current (cancellable);
enumerator->priv->pending = TRUE;
info = (* class->next_file) (enumerator, cancellable, error);
enumerator->priv->pending = FALSE;
if (cancellable)
- g_pop_current_cancellable (cancellable);
+ g_cancellable_pop_current (cancellable);
return info;
}
}
if (cancellable)
- g_push_current_cancellable (cancellable);
+ g_cancellable_push_current (cancellable);
enumerator->priv->pending = TRUE;
(* class->close_fn) (enumerator, cancellable, error);
enumerator->priv->closed = TRUE;
if (cancellable)
- g_pop_current_cancellable (cancellable);
+ g_cancellable_pop_current (cancellable);
return TRUE;
}
info = NULL;
if (cancellable)
- g_push_current_cancellable (cancellable);
+ g_cancellable_push_current (cancellable);
class = G_FILE_INPUT_STREAM_GET_CLASS (stream);
if (class->query_info)
_("Stream doesn't support query_info"));
if (cancellable)
- g_pop_current_cancellable (cancellable);
+ g_cancellable_pop_current (cancellable);
g_input_stream_clear_pending (input_stream);
return FALSE;
if (cancellable)
- g_push_current_cancellable (cancellable);
+ g_cancellable_push_current (cancellable);
res = class->seek (stream, offset, type, cancellable, error);
if (cancellable)
- g_pop_current_cancellable (cancellable);
+ g_cancellable_pop_current (cancellable);
g_input_stream_clear_pending (input_stream);
info = NULL;
if (cancellable)
- g_push_current_cancellable (cancellable);
+ g_cancellable_push_current (cancellable);
class = G_FILE_OUTPUT_STREAM_GET_CLASS (stream);
if (class->query_info)
_("Stream doesn't support query_info"));
if (cancellable)
- g_pop_current_cancellable (cancellable);
+ g_cancellable_pop_current (cancellable);
g_output_stream_clear_pending (output_stream);
return FALSE;
if (cancellable)
- g_push_current_cancellable (cancellable);
+ g_cancellable_push_current (cancellable);
res = class->seek (stream, offset, type, cancellable, error);
if (cancellable)
- g_pop_current_cancellable (cancellable);
+ g_cancellable_pop_current (cancellable);
g_output_stream_clear_pending (output_stream);
return FALSE;
if (cancellable)
- g_push_current_cancellable (cancellable);
+ g_cancellable_push_current (cancellable);
res = class->truncate_fn (stream, size, cancellable, error);
if (cancellable)
- g_pop_current_cancellable (cancellable);
+ g_cancellable_pop_current (cancellable);
g_output_stream_clear_pending (output_stream);
return -1;
if (cancellable)
- g_push_current_cancellable (cancellable);
+ g_cancellable_push_current (cancellable);
res = class->read_fn (stream, buffer, count, cancellable, error);
if (cancellable)
- g_pop_current_cancellable (cancellable);
+ g_cancellable_pop_current (cancellable);
g_input_stream_clear_pending (stream);
return -1;
if (cancellable)
- g_push_current_cancellable (cancellable);
+ g_cancellable_push_current (cancellable);
res = class->skip (stream, count, cancellable, error);
if (cancellable)
- g_pop_current_cancellable (cancellable);
+ g_cancellable_pop_current (cancellable);
g_input_stream_clear_pending (stream);
return FALSE;
if (cancellable)
- g_push_current_cancellable (cancellable);
+ g_cancellable_push_current (cancellable);
if (class->close_fn)
res = class->close_fn (stream, cancellable, error);
if (cancellable)
- g_pop_current_cancellable (cancellable);
+ g_cancellable_pop_current (cancellable);
g_input_stream_clear_pending (stream);
g_cancellable_set_error_if_cancelled
g_cancellable_get_fd
g_cancellable_get_current
-g_push_current_cancellable
-g_pop_current_cancellable
+g_cancellable_push_current
+g_cancellable_pop_current
g_cancellable_reset
g_cancellable_cancel
#endif
GIOJob *job = data;
if (job->cancellable)
- g_push_current_cancellable (job->cancellable);
+ g_cancellable_push_current (job->cancellable);
job->job_func (job, job->cancellable, job->data);
if (job->cancellable)
- g_pop_current_cancellable (job->cancellable);
+ g_cancellable_pop_current (job->cancellable);
if (job->destroy_notify)
job->destroy_notify (job->data);
GIOJob *job = data;
if (job->cancellable)
- g_push_current_cancellable (job->cancellable);
+ g_cancellable_push_current (job->cancellable);
job->job_func (job, job->cancellable, job->data);
if (job->cancellable)
- g_pop_current_cancellable (job->cancellable);
+ g_cancellable_pop_current (job->cancellable);
if (job->destroy_notify)
job->destroy_notify (job->data);
return -1;
if (cancellable)
- g_push_current_cancellable (cancellable);
+ g_cancellable_push_current (cancellable);
res = class->write_fn (stream, buffer, count, cancellable, error);
if (cancellable)
- g_pop_current_cancellable (cancellable);
+ g_cancellable_pop_current (cancellable);
g_output_stream_clear_pending (stream);
if (class->flush)
{
if (cancellable)
- g_push_current_cancellable (cancellable);
+ g_cancellable_push_current (cancellable);
res = class->flush (stream, cancellable, error);
if (cancellable)
- g_pop_current_cancellable (cancellable);
+ g_cancellable_pop_current (cancellable);
}
g_output_stream_clear_pending (stream);
res = TRUE;
if (cancellable)
- g_push_current_cancellable (cancellable);
+ g_cancellable_push_current (cancellable);
res = class->splice (stream, source, flags, cancellable, error);
if (cancellable)
- g_pop_current_cancellable (cancellable);
+ g_cancellable_pop_current (cancellable);
g_output_stream_clear_pending (stream);
return FALSE;
if (cancellable)
- g_push_current_cancellable (cancellable);
+ g_cancellable_push_current (cancellable);
if (class->flush)
res = class->flush (stream, cancellable, error);
}
if (cancellable)
- g_pop_current_cancellable (cancellable);
+ g_cancellable_pop_current (cancellable);
stream->priv->closed = TRUE;
g_output_stream_clear_pending (stream);