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

GOutputStream: Rename _g_output_stream_close_internal() for consistency

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=691581
This commit is contained in:
Mike Ruprecht 2013-02-24 09:09:05 -06:00 committed by Dan Winship
parent e967a76728
commit 416ca8ad57
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gio/goutputstream.c
View File

@ -96,7 +96,7 @@ static void g_output_stream_real_close_async (GOutputStream *s
static gboolean g_output_stream_real_close_finish (GOutputStream *stream, static gboolean g_output_stream_real_close_finish (GOutputStream *stream,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
static gboolean _g_output_stream_close_internal (GOutputStream *stream, static gboolean g_output_stream_internal_close (GOutputStream *stream,
GCancellable *cancellable, GCancellable *cancellable,
GError **error); GError **error);
@ -502,7 +502,7 @@ g_output_stream_real_splice (GOutputStream *stream,
if (flags & G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET) if (flags & G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET)
{ {
/* But write errors on close are bad! */ /* But write errors on close are bad! */
res = _g_output_stream_close_internal (stream, cancellable, error); res = g_output_stream_internal_close (stream, cancellable, error);
} }
if (res) if (res)
@ -514,9 +514,9 @@ g_output_stream_real_splice (GOutputStream *stream,
/* Must always be called inside /* Must always be called inside
* g_output_stream_set_pending()/g_output_stream_clear_pending(). */ * g_output_stream_set_pending()/g_output_stream_clear_pending(). */
static gboolean static gboolean
_g_output_stream_close_internal (GOutputStream *stream, g_output_stream_internal_close (GOutputStream *stream,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
GOutputStreamClass *class; GOutputStreamClass *class;
gboolean res; gboolean res;
@ -613,7 +613,7 @@ g_output_stream_close (GOutputStream *stream,
if (!g_output_stream_set_pending (stream, error)) if (!g_output_stream_set_pending (stream, error))
return FALSE; return FALSE;
res = _g_output_stream_close_internal (stream, cancellable, error); res = g_output_stream_internal_close (stream, cancellable, error);
g_output_stream_clear_pending (stream); g_output_stream_clear_pending (stream);