projects
/
platform
/
upstream
/
glib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cleanup
[platform/upstream/glib.git]
/
gio
/
gfilteroutputstream.c
diff --git
a/gio/gfilteroutputstream.c
b/gio/gfilteroutputstream.c
index
606f669
..
9089579
100644
(file)
--- a/
gio/gfilteroutputstream.c
+++ b/
gio/gfilteroutputstream.c
@@
-13,27
+13,27
@@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Author: Christian Kellner <gicmo@gnome.org>
*/
#include "config.h"
#include "gfilteroutputstream.h"
*
* Author: Christian Kellner <gicmo@gnome.org>
*/
#include "config.h"
#include "gfilteroutputstream.h"
-#include "gsimpleasyncresult.h"
#include "goutputstream.h"
#include "glibintl.h"
#include "goutputstream.h"
#include "glibintl.h"
-#include "gioalias.h"
/**
* SECTION:gfilteroutputstream
* @short_description: Filter Output Stream
* @include: gio/gio.h
*
/**
* SECTION:gfilteroutputstream
* @short_description: Filter Output Stream
* @include: gio/gio.h
*
- **/
+ * Base class for output stream implementations that perform some
+ * kind of filtering operation on a base stream. Typical examples
+ * of filtering operations are character set conversion, compression
+ * and byte order flipping.
+ */
enum {
PROP_0,
enum {
PROP_0,
@@
-65,16
+65,13
@@
static gboolean g_filter_output_stream_close (GOutputStream *stream,
GCancellable *cancellable,
GError **error);
GCancellable *cancellable,
GError **error);
-G_DEFINE_TYPE (GFilterOutputStream, g_filter_output_stream, G_TYPE_OUTPUT_STREAM)
-
-#define GET_PRIVATE(inst) G_TYPE_INSTANCE_GET_PRIVATE (inst, \
- G_TYPE_FILTER_OUTPUT_STREAM, GFilterOutputStreamPrivate)
-
typedef struct
{
gboolean close_base;
} GFilterOutputStreamPrivate;
typedef struct
{
gboolean close_base;
} GFilterOutputStreamPrivate;
+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GFilterOutputStream, g_filter_output_stream, G_TYPE_OUTPUT_STREAM)
+
static void
g_filter_output_stream_class_init (GFilterOutputStreamClass *klass)
{
static void
g_filter_output_stream_class_init (GFilterOutputStreamClass *klass)
{
@@
-91,8
+88,6
@@
g_filter_output_stream_class_init (GFilterOutputStreamClass *klass)
ostream_class->flush = g_filter_output_stream_flush;
ostream_class->close_fn = g_filter_output_stream_close;
ostream_class->flush = g_filter_output_stream_flush;
ostream_class->close_fn = g_filter_output_stream_close;
- g_type_class_add_private (klass, sizeof (GFilterOutputStreamPrivate));
-
g_object_class_install_property (object_class,
PROP_BASE_STREAM,
g_param_spec_object ("base-stream",
g_object_class_install_property (object_class,
PROP_BASE_STREAM,
g_param_spec_object ("base-stream",
@@
-148,8
+143,10
@@
g_filter_output_stream_get_property (GObject *object,
GParamSpec *pspec)
{
GFilterOutputStream *filter_stream;
GParamSpec *pspec)
{
GFilterOutputStream *filter_stream;
+ GFilterOutputStreamPrivate *priv;
filter_stream = G_FILTER_OUTPUT_STREAM (object);
filter_stream = G_FILTER_OUTPUT_STREAM (object);
+ priv = g_filter_output_stream_get_instance_private (filter_stream);
switch (prop_id)
{
switch (prop_id)
{
@@
-158,7
+155,7
@@
g_filter_output_stream_get_property (GObject *object,
break;
case PROP_CLOSE_BASE:
break;
case PROP_CLOSE_BASE:
- g_value_set_boolean (value,
GET_PRIVATE (filter_stream)
->close_base);
+ g_value_set_boolean (value,
priv
->close_base);
break;
default:
break;
default:
@@
-196,7
+193,7
@@
g_filter_output_stream_init (GFilterOutputStream *stream)
*
* Gets the base stream for the filter stream.
*
*
* Gets the base stream for the filter stream.
*
- * Returns: a #GOutputStream.
+ * Returns:
(transfer none):
a #GOutputStream.
**/
GOutputStream *
g_filter_output_stream_get_base_stream (GFilterOutputStream *stream)
**/
GOutputStream *
g_filter_output_stream_get_base_stream (GFilterOutputStream *stream)
@@
-213,14
+210,18
@@
g_filter_output_stream_get_base_stream (GFilterOutputStream *stream)
* Returns whether the base stream will be closed when @stream is
* closed.
*
* Returns whether the base stream will be closed when @stream is
* closed.
*
- * Return
value
: %TRUE if the base stream will be closed.
+ * Return
s
: %TRUE if the base stream will be closed.
**/
gboolean
g_filter_output_stream_get_close_base_stream (GFilterOutputStream *stream)
{
**/
gboolean
g_filter_output_stream_get_close_base_stream (GFilterOutputStream *stream)
{
+ GFilterOutputStreamPrivate *priv;
+
g_return_val_if_fail (G_IS_FILTER_OUTPUT_STREAM (stream), FALSE);
g_return_val_if_fail (G_IS_FILTER_OUTPUT_STREAM (stream), FALSE);
- return GET_PRIVATE (stream)->close_base;
+ priv = g_filter_output_stream_get_instance_private (stream);
+
+ return priv->close_base;
}
/**
}
/**
@@
-240,7
+241,7
@@
g_filter_output_stream_set_close_base_stream (GFilterOutputStream *stream,
close_base = !!close_base;
close_base = !!close_base;
- priv =
GET_PRIVATE
(stream);
+ priv =
g_filter_output_stream_get_instance_private
(stream);
if (priv->close_base != close_base)
{
if (priv->close_base != close_base)
{
@@
-292,14
+293,12
@@
g_filter_output_stream_close (GOutputStream *stream,
GCancellable *cancellable,
GError **error)
{
GCancellable *cancellable,
GError **error)
{
+ GFilterOutputStream *filter_stream = G_FILTER_OUTPUT_STREAM (stream);
+ GFilterOutputStreamPrivate *priv = g_filter_output_stream_get_instance_private (filter_stream);
gboolean res = TRUE;
gboolean res = TRUE;
- if (
GET_PRIVATE (stream)
->close_base)
+ if (
priv
->close_base)
{
{
- GFilterOutputStream *filter_stream;
-
- filter_stream = G_FILTER_OUTPUT_STREAM (stream);
-
res = g_output_stream_close (filter_stream->base_stream,
cancellable,
error);
res = g_output_stream_close (filter_stream->base_stream,
cancellable,
error);
@@
-307,6
+306,3
@@
g_filter_output_stream_close (GOutputStream *stream,
return res;
}
return res;
}
-
-#define __G_FILTER_OUTPUT_STREAM_C__
-#include "gioaliasdef.c"