Fix a lot of clang complaints

Mostly dead assignments.
This commit is contained in:
Matthias Clasen
2009-09-09 00:18:23 -04:00
parent 04d632ccf5
commit 53fc10d269
13 changed files with 35 additions and 84 deletions

View File

@@ -474,12 +474,10 @@ g_buffered_output_stream_flush (GOutputStream *stream,
GError **error)
{
GBufferedOutputStream *bstream;
GBufferedOutputStreamPrivate *priv;
GOutputStream *base_stream;
gboolean res;
bstream = G_BUFFERED_OUTPUT_STREAM (stream);
priv = bstream->priv;
base_stream = G_FILTER_OUTPUT_STREAM (stream)->base_stream;
res = flush_buffer (bstream, cancellable, error);
@@ -498,23 +496,20 @@ g_buffered_output_stream_close (GOutputStream *stream,
GError **error)
{
GBufferedOutputStream *bstream;
GBufferedOutputStreamPrivate *priv;
GOutputStream *base_stream;
gboolean res;
bstream = G_BUFFERED_OUTPUT_STREAM (stream);
priv = bstream->priv;
base_stream = G_FILTER_OUTPUT_STREAM (bstream)->base_stream;
res = flush_buffer (bstream, cancellable, error);
if (g_filter_output_stream_get_close_base_stream (G_FILTER_OUTPUT_STREAM (stream)))
{
/* report the first error but still close the stream */
if (res)
res = g_output_stream_close (base_stream, cancellable, error);
res = g_output_stream_close (base_stream, cancellable, error);
else
g_output_stream_close (base_stream, cancellable, NULL);
g_output_stream_close (base_stream, cancellable, NULL);
}
return res;