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

g_push/pop_current_cancellable -> g_cancellable_push/pop_current

Browse Source 
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


svn path=/trunk/; revision=6115
This commit is contained in:
Alexander Larsson 2007-12-13 16:48:06 +00:00 committed by Alexander Larsson
parent f6b9b4f45e
commit 2ae689e31f
11 changed files with 58 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gio/ChangeLog
View File

@ -1,3 +1,17 @@
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> 2007-12-13 Alexander Larsson <alexl@redhat.com>
* gfile.[ch]: * gfile.[ch]:

8
gio/gbufferedinputstream.c
View File

@ -409,13 +409,13 @@ g_buffered_input_stream_fill (GBufferedInputStream *stream,
return -1; return -1;
if (cancellable) if (cancellable)
g_push_current_cancellable (cancellable); g_cancellable_push_current (cancellable);
class = G_BUFFERED_INPUT_STREAM_GET_CLASS (stream); class = G_BUFFERED_INPUT_STREAM_GET_CLASS (stream);
res = class->fill (stream, count, cancellable, error); res = class->fill (stream, count, cancellable, error);
if (cancellable) if (cancellable)
g_pop_current_cancellable (cancellable); g_cancellable_pop_current (cancellable);
g_input_stream_clear_pending (input_stream); g_input_stream_clear_pending (input_stream);
@ -883,7 +883,7 @@ g_buffered_input_stream_read_byte (GBufferedInputStream *stream,
/* Byte not available, request refill for more */ /* Byte not available, request refill for more */
if (cancellable) if (cancellable)
g_push_current_cancellable (cancellable); g_cancellable_push_current (cancellable);
priv->pos = 0; priv->pos = 0;
priv->end = 0; priv->end = 0;
@ -892,7 +892,7 @@ g_buffered_input_stream_read_byte (GBufferedInputStream *stream,
nread = class->fill (stream, priv->len, cancellable, error); nread = class->fill (stream, priv->len, cancellable, error);
if (cancellable) if (cancellable)
g_pop_current_cancellable (cancellable); g_cancellable_pop_current (cancellable);
g_input_stream_clear_pending (input_stream); g_input_stream_clear_pending (input_stream);

8
gio/gcancellable.c
View File

@ -171,7 +171,7 @@ g_cancellable_new (void)
} }
/** /**
* g_push_current_cancellable: * g_cancellable_push_current:
* @cancellable: optional #GCancellable object, %NULL to ignore. * @cancellable: optional #GCancellable object, %NULL to ignore.
* *
* Pushes @cancellable onto the cancellable stack. The current * Pushes @cancellable onto the cancellable stack. The current
@ -184,7 +184,7 @@ g_cancellable_new (void)
* so you rarely have to call this yourself. * so you rarely have to call this yourself.
**/ **/
void void
g_push_current_cancellable (GCancellable *cancellable) g_cancellable_push_current (GCancellable *cancellable)
{ {
GSList *l; GSList *l;
@ -196,14 +196,14 @@ g_push_current_cancellable (GCancellable *cancellable)
} }
/** /**
* g_pop_current_cancellable: * g_cancellable_pop_current:
* @cancellable: optional #GCancellable object, %NULL to ignore. * @cancellable: optional #GCancellable object, %NULL to ignore.
* *
* Pops @cancellable off the cancellable stack (verifying that @cancellable * Pops @cancellable off the cancellable stack (verifying that @cancellable
* is on the top of the stack). * is on the top of the stack).
**/ **/
void void
g_pop_current_cancellable (GCancellable *cancellable) g_cancellable_pop_current (GCancellable *cancellable)
{ {
GSList *l; GSList *l;

4
gio/gcancellable.h
View File

@ -67,8 +67,8 @@ gboolean g_cancellable_set_error_if_cancelled (GCancellable *cancellable,
GError **error); GError **error);
int g_cancellable_get_fd (GCancellable *cancellable); int g_cancellable_get_fd (GCancellable *cancellable);
GCancellable *g_cancellable_get_current (void); GCancellable *g_cancellable_get_current (void);
void g_push_current_cancellable (GCancellable *cancellable); void g_cancellable_push_current (GCancellable *cancellable);
void g_pop_current_cancellable (GCancellable *cancellable); void g_cancellable_pop_current (GCancellable *cancellable);
void g_cancellable_reset (GCancellable *cancellable); void g_cancellable_reset (GCancellable *cancellable);

8
gio/gfileenumerator.c
View File

@ -166,14 +166,14 @@ g_file_enumerator_next_file (GFileEnumerator *enumerator,
class = G_FILE_ENUMERATOR_GET_CLASS (enumerator); class = G_FILE_ENUMERATOR_GET_CLASS (enumerator);
if (cancellable) if (cancellable)
g_push_current_cancellable (cancellable); g_cancellable_push_current (cancellable);
enumerator->priv->pending = TRUE; enumerator->priv->pending = TRUE;
info = (* class->next_file) (enumerator, cancellable, error); info = (* class->next_file) (enumerator, cancellable, error);
enumerator->priv->pending = FALSE; enumerator->priv->pending = FALSE;
if (cancellable) if (cancellable)
g_pop_current_cancellable (cancellable); g_cancellable_pop_current (cancellable);
return info; return info;
} }
@ -216,7 +216,7 @@ g_file_enumerator_close (GFileEnumerator *enumerator,
} }
if (cancellable) if (cancellable)
g_push_current_cancellable (cancellable); g_cancellable_push_current (cancellable);
enumerator->priv->pending = TRUE; enumerator->priv->pending = TRUE;
(* class->close_fn) (enumerator, cancellable, error); (* class->close_fn) (enumerator, cancellable, error);
@ -224,7 +224,7 @@ g_file_enumerator_close (GFileEnumerator *enumerator,
enumerator->priv->closed = TRUE; enumerator->priv->closed = TRUE;
if (cancellable) if (cancellable)
g_pop_current_cancellable (cancellable); g_cancellable_pop_current (cancellable);
return TRUE; return TRUE;
} }

8
gio/gfileinputstream.c
View File

@ -134,7 +134,7 @@ g_file_input_stream_query_info (GFileInputStream *stream,
info = NULL; info = NULL;
if (cancellable) if (cancellable)
g_push_current_cancellable (cancellable); g_cancellable_push_current (cancellable);
class = G_FILE_INPUT_STREAM_GET_CLASS (stream); class = G_FILE_INPUT_STREAM_GET_CLASS (stream);
if (class->query_info) if (class->query_info)
@ -144,7 +144,7 @@ g_file_input_stream_query_info (GFileInputStream *stream,
_("Stream doesn't support query_info")); _("Stream doesn't support query_info"));
if (cancellable) if (cancellable)
g_pop_current_cancellable (cancellable); g_cancellable_pop_current (cancellable);
g_input_stream_clear_pending (input_stream); g_input_stream_clear_pending (input_stream);
@ -360,12 +360,12 @@ g_file_input_stream_seek (GFileInputStream *stream,
return FALSE; return FALSE;
if (cancellable) if (cancellable)
g_push_current_cancellable (cancellable); g_cancellable_push_current (cancellable);
res = class->seek (stream, offset, type, cancellable, error); res = class->seek (stream, offset, type, cancellable, error);
if (cancellable) if (cancellable)
g_pop_current_cancellable (cancellable); g_cancellable_pop_current (cancellable);
g_input_stream_clear_pending (input_stream); g_input_stream_clear_pending (input_stream);

12
gio/gfileoutputstream.c
View File

@ -144,7 +144,7 @@ g_file_output_stream_query_info (GFileOutputStream *stream,
info = NULL; info = NULL;
if (cancellable) if (cancellable)
g_push_current_cancellable (cancellable); g_cancellable_push_current (cancellable);
class = G_FILE_OUTPUT_STREAM_GET_CLASS (stream); class = G_FILE_OUTPUT_STREAM_GET_CLASS (stream);
if (class->query_info) if (class->query_info)
@ -154,7 +154,7 @@ g_file_output_stream_query_info (GFileOutputStream *stream,
_("Stream doesn't support query_info")); _("Stream doesn't support query_info"));
if (cancellable) if (cancellable)
g_pop_current_cancellable (cancellable); g_cancellable_pop_current (cancellable);
g_output_stream_clear_pending (output_stream); g_output_stream_clear_pending (output_stream);
@ -400,12 +400,12 @@ g_file_output_stream_seek (GFileOutputStream *stream,
return FALSE; return FALSE;
if (cancellable) if (cancellable)
g_push_current_cancellable (cancellable); g_cancellable_push_current (cancellable);
res = class->seek (stream, offset, type, cancellable, error); res = class->seek (stream, offset, type, cancellable, error);
if (cancellable) if (cancellable)
g_pop_current_cancellable (cancellable); g_cancellable_pop_current (cancellable);
g_output_stream_clear_pending (output_stream); g_output_stream_clear_pending (output_stream);
@ -495,12 +495,12 @@ g_file_output_stream_truncate (GFileOutputStream *stream,
return FALSE; return FALSE;
if (cancellable) if (cancellable)
g_push_current_cancellable (cancellable); g_cancellable_push_current (cancellable);
res = class->truncate_fn (stream, size, cancellable, error); res = class->truncate_fn (stream, size, cancellable, error);
if (cancellable) if (cancellable)
g_pop_current_cancellable (cancellable); g_cancellable_pop_current (cancellable);
g_output_stream_clear_pending (output_stream); g_output_stream_clear_pending (output_stream);

12
gio/ginputstream.c
View File

@ -199,12 +199,12 @@ g_input_stream_read (GInputStream *stream,
return -1; return -1;
if (cancellable) if (cancellable)
g_push_current_cancellable (cancellable); g_cancellable_push_current (cancellable);
res = class->read_fn (stream, buffer, count, cancellable, error); res = class->read_fn (stream, buffer, count, cancellable, error);
if (cancellable) if (cancellable)
g_pop_current_cancellable (cancellable); g_cancellable_pop_current (cancellable);
g_input_stream_clear_pending (stream); g_input_stream_clear_pending (stream);
@ -324,12 +324,12 @@ g_input_stream_skip (GInputStream *stream,
return -1; return -1;
if (cancellable) if (cancellable)
g_push_current_cancellable (cancellable); g_cancellable_push_current (cancellable);
res = class->skip (stream, count, cancellable, error); res = class->skip (stream, count, cancellable, error);
if (cancellable) if (cancellable)
g_pop_current_cancellable (cancellable); g_cancellable_pop_current (cancellable);
g_input_stream_clear_pending (stream); g_input_stream_clear_pending (stream);
@ -445,13 +445,13 @@ g_input_stream_close (GInputStream *stream,
return FALSE; return FALSE;
if (cancellable) if (cancellable)
g_push_current_cancellable (cancellable); g_cancellable_push_current (cancellable);
if (class->close_fn) if (class->close_fn)
res = class->close_fn (stream, cancellable, error); res = class->close_fn (stream, cancellable, error);
if (cancellable) if (cancellable)
g_pop_current_cancellable (cancellable); g_cancellable_pop_current (cancellable);
g_input_stream_clear_pending (stream); g_input_stream_clear_pending (stream);

4
gio/gio.symbols
View File

@ -115,8 +115,8 @@ g_cancellable_is_cancelled
g_cancellable_set_error_if_cancelled g_cancellable_set_error_if_cancelled
g_cancellable_get_fd g_cancellable_get_fd
g_cancellable_get_current g_cancellable_get_current
g_push_current_cancellable g_cancellable_push_current
g_pop_current_cancellable g_cancellable_pop_current
g_cancellable_reset g_cancellable_reset
g_cancellable_cancel g_cancellable_cancel
#endif #endif

8
gio/gioscheduler.c
View File

@ -156,10 +156,10 @@ io_job_thread (gpointer data,
GIOJob *job = data; GIOJob *job = data;
if (job->cancellable) if (job->cancellable)
g_push_current_cancellable (job->cancellable); g_cancellable_push_current (job->cancellable);
job->job_func (job, job->cancellable, job->data); job->job_func (job, job->cancellable, job->data);
if (job->cancellable) if (job->cancellable)
g_pop_current_cancellable (job->cancellable); g_cancellable_pop_current (job->cancellable);
if (job->destroy_notify) if (job->destroy_notify)
job->destroy_notify (job->data); job->destroy_notify (job->data);
@ -175,12 +175,12 @@ run_job_at_idle (gpointer data)
GIOJob *job = data; GIOJob *job = data;
if (job->cancellable) if (job->cancellable)
g_push_current_cancellable (job->cancellable); g_cancellable_push_current (job->cancellable);
job->job_func (job, job->cancellable, job->data); job->job_func (job, job->cancellable, job->data);
if (job->cancellable) if (job->cancellable)
g_pop_current_cancellable (job->cancellable); g_cancellable_pop_current (job->cancellable);
if (job->destroy_notify) if (job->destroy_notify)
job->destroy_notify (job->data); job->destroy_notify (job->data);

16
gio/goutputstream.c
View File

@ -207,12 +207,12 @@ g_output_stream_write (GOutputStream *stream,
return -1; return -1;
if (cancellable) if (cancellable)
g_push_current_cancellable (cancellable); g_cancellable_push_current (cancellable);
res = class->write_fn (stream, buffer, count, cancellable, error); res = class->write_fn (stream, buffer, count, cancellable, error);
if (cancellable) if (cancellable)
g_pop_current_cancellable (cancellable); g_cancellable_pop_current (cancellable);
g_output_stream_clear_pending (stream); g_output_stream_clear_pending (stream);
@ -318,12 +318,12 @@ g_output_stream_flush (GOutputStream *stream,
if (class->flush) if (class->flush)
{ {
if (cancellable) if (cancellable)
g_push_current_cancellable (cancellable); g_cancellable_push_current (cancellable);
res = class->flush (stream, cancellable, error); res = class->flush (stream, cancellable, error);
if (cancellable) if (cancellable)
g_pop_current_cancellable (cancellable); g_cancellable_pop_current (cancellable);
} }
g_output_stream_clear_pending (stream); g_output_stream_clear_pending (stream);
@ -371,12 +371,12 @@ g_output_stream_splice (GOutputStream *stream,
res = TRUE; res = TRUE;
if (cancellable) if (cancellable)
g_push_current_cancellable (cancellable); g_cancellable_push_current (cancellable);
res = class->splice (stream, source, flags, cancellable, error); res = class->splice (stream, source, flags, cancellable, error);
if (cancellable) if (cancellable)
g_pop_current_cancellable (cancellable); g_cancellable_pop_current (cancellable);
g_output_stream_clear_pending (stream); g_output_stream_clear_pending (stream);
@ -516,7 +516,7 @@ g_output_stream_close (GOutputStream *stream,
return FALSE; return FALSE;
if (cancellable) if (cancellable)
g_push_current_cancellable (cancellable); g_cancellable_push_current (cancellable);
if (class->flush) if (class->flush)
res = class->flush (stream, cancellable, error); res = class->flush (stream, cancellable, error);
@ -539,7 +539,7 @@ g_output_stream_close (GOutputStream *stream,
} }
if (cancellable) if (cancellable)
g_pop_current_cancellable (cancellable); g_cancellable_pop_current (cancellable);
stream->priv->closed = TRUE; stream->priv->closed = TRUE;
g_output_stream_clear_pending (stream); g_output_stream_clear_pending (stream);