From 1225e063a1961c4b1b7d3b9dbb1f0d0e19888732 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 14 Mar 2002 22:38:46 +0000 Subject: [PATCH] Fix some gsize/gint mismatches. (#74422, Miroslaw Dobrzanski-Neumann) Thu Mar 14 17:37:45 2002 Owen Taylor * glib/giochannel.c (g_io_channel_write_chars): Fix some gsize/gint mismatches. (#74422, Miroslaw Dobrzanski-Neumann) --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/giochannel.c | 4 ++-- 9 files changed, 42 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 06dfb5dd..edd3ef36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Mar 14 17:37:45 2002 Owen Taylor + + * glib/giochannel.c (g_io_channel_write_chars): Fix some + gsize/gint mismatches. (#74422, Miroslaw Dobrzanski-Neumann) + 2002-03-14 Sebastian Wilhelmi * glib/gmessages.c: Fixed threading issues brought up by diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 06dfb5dd..edd3ef36 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Thu Mar 14 17:37:45 2002 Owen Taylor + + * glib/giochannel.c (g_io_channel_write_chars): Fix some + gsize/gint mismatches. (#74422, Miroslaw Dobrzanski-Neumann) + 2002-03-14 Sebastian Wilhelmi * glib/gmessages.c: Fixed threading issues brought up by diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 06dfb5dd..edd3ef36 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Mar 14 17:37:45 2002 Owen Taylor + + * glib/giochannel.c (g_io_channel_write_chars): Fix some + gsize/gint mismatches. (#74422, Miroslaw Dobrzanski-Neumann) + 2002-03-14 Sebastian Wilhelmi * glib/gmessages.c: Fixed threading issues brought up by diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 06dfb5dd..edd3ef36 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Thu Mar 14 17:37:45 2002 Owen Taylor + + * glib/giochannel.c (g_io_channel_write_chars): Fix some + gsize/gint mismatches. (#74422, Miroslaw Dobrzanski-Neumann) + 2002-03-14 Sebastian Wilhelmi * glib/gmessages.c: Fixed threading issues brought up by diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 06dfb5dd..edd3ef36 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Thu Mar 14 17:37:45 2002 Owen Taylor + + * glib/giochannel.c (g_io_channel_write_chars): Fix some + gsize/gint mismatches. (#74422, Miroslaw Dobrzanski-Neumann) + 2002-03-14 Sebastian Wilhelmi * glib/gmessages.c: Fixed threading issues brought up by diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 06dfb5dd..edd3ef36 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu Mar 14 17:37:45 2002 Owen Taylor + + * glib/giochannel.c (g_io_channel_write_chars): Fix some + gsize/gint mismatches. (#74422, Miroslaw Dobrzanski-Neumann) + 2002-03-14 Sebastian Wilhelmi * glib/gmessages.c: Fixed threading issues brought up by diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 06dfb5dd..edd3ef36 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Mar 14 17:37:45 2002 Owen Taylor + + * glib/giochannel.c (g_io_channel_write_chars): Fix some + gsize/gint mismatches. (#74422, Miroslaw Dobrzanski-Neumann) + 2002-03-14 Sebastian Wilhelmi * glib/gmessages.c: Fixed threading issues brought up by diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 06dfb5dd..edd3ef36 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Mar 14 17:37:45 2002 Owen Taylor + + * glib/giochannel.c (g_io_channel_write_chars): Fix some + gsize/gint mismatches. (#74422, Miroslaw Dobrzanski-Neumann) + 2002-03-14 Sebastian Wilhelmi * glib/gmessages.c: Fixed threading issues brought up by diff --git a/glib/giochannel.c b/glib/giochannel.c index 7a7e980a..f50eee84 100644 --- a/glib/giochannel.c +++ b/glib/giochannel.c @@ -1730,7 +1730,7 @@ g_io_channel_read_chars (GIOChannel *channel, if (!channel->use_buffer) { - gint tmp_bytes; + gsize tmp_bytes; g_assert (!channel->read_buf || channel->read_buf->len == 0); @@ -1922,7 +1922,7 @@ g_io_channel_write_chars (GIOChannel *channel, if (!channel->use_buffer) { - gint tmp_bytes; + gsize tmp_bytes; g_assert (!channel->write_buf || channel->write_buf->len == 0); g_assert (channel->partial_write_buf[0] == '\0'); -- 2.34.1