X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fgconverterinputstream.c;h=7e22aaaf64035bde124483aa6c7235d01d543203;hb=5463c8cedbdf9ea2829f83c53876f21b34f57250;hp=1684635f86fc798d8382bfd158ca3a55c2d41831;hpb=875854411a4ea5fdd1d9217d7856858d89090cb9;p=platform%2Fupstream%2Fglib.git
diff --git a/gio/gconverterinputstream.c b/gio/gconverterinputstream.c
index 1684635..7e22aaa 100644
--- a/gio/gconverterinputstream.c
+++ b/gio/gconverterinputstream.c
@@ -13,9 +13,7 @@
* 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 .
*
* Author: Alexander Larsson
*/
@@ -99,9 +97,9 @@ static void g_converter_input_stream_pollable_iface_init (GPollableInputStreamI
G_DEFINE_TYPE_WITH_CODE (GConverterInputStream,
g_converter_input_stream,
G_TYPE_FILTER_INPUT_STREAM,
+ G_ADD_PRIVATE (GConverterInputStream)
G_IMPLEMENT_INTERFACE (G_TYPE_POLLABLE_INPUT_STREAM,
- g_converter_input_stream_pollable_iface_init);
- )
+ g_converter_input_stream_pollable_iface_init))
static void
g_converter_input_stream_class_init (GConverterInputStreamClass *klass)
@@ -109,8 +107,6 @@ g_converter_input_stream_class_init (GConverterInputStreamClass *klass)
GObjectClass *object_class;
GInputStreamClass *istream_class;
- g_type_class_add_private (klass, sizeof (GConverterInputStreamPrivate));
-
object_class = G_OBJECT_CLASS (klass);
object_class->get_property = g_converter_input_stream_get_property;
object_class->set_property = g_converter_input_stream_set_property;
@@ -207,9 +203,7 @@ g_converter_input_stream_get_property (GObject *object,
static void
g_converter_input_stream_init (GConverterInputStream *stream)
{
- stream->priv = G_TYPE_INSTANCE_GET_PRIVATE (stream,
- G_TYPE_CONVERTER_INPUT_STREAM,
- GConverterInputStreamPrivate);
+ stream->priv = g_converter_input_stream_get_instance_private (stream);
}
/**
@@ -415,7 +409,7 @@ read_internal (GInputStream *stream,
buffer_read (&priv->converted_buffer, buffer, available);
total_bytes_read = available;
- (char *) buffer += available;
+ buffer = (char *) buffer + available;
count -= available;
/* If there is no data to convert, and no pre-converted data,