From ac1080ee3b1aa149edb1839d33249e516c5d6db7 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Tue, 15 Oct 2002 22:39:16 +0000 Subject: [PATCH] use gsize instead of int where appropriate (64-bit cleanliness fix). Tue Oct 15 15:28:47 2002 Manish Singh * tests/iochannel-test.c: use gsize instead of int where appropriate (64-bit cleanliness fix). Removed leftover line_term cruft. --- ChangeLog | 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 +++++ tests/iochannel-test.c | 9 +++++---- 8 files changed, 40 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 802c9dd28..04c64f71a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Oct 15 15:28:47 2002 Manish Singh + + * tests/iochannel-test.c: use gsize instead of int where appropriate + (64-bit cleanliness fix). Removed leftover line_term cruft. + Tue Oct 15 15:07:45 2002 Manish Singh * gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 802c9dd28..04c64f71a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Oct 15 15:28:47 2002 Manish Singh + + * tests/iochannel-test.c: use gsize instead of int where appropriate + (64-bit cleanliness fix). Removed leftover line_term cruft. + Tue Oct 15 15:07:45 2002 Manish Singh * gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am: diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 802c9dd28..04c64f71a 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +Tue Oct 15 15:28:47 2002 Manish Singh + + * tests/iochannel-test.c: use gsize instead of int where appropriate + (64-bit cleanliness fix). Removed leftover line_term cruft. + Tue Oct 15 15:07:45 2002 Manish Singh * gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 802c9dd28..04c64f71a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Tue Oct 15 15:28:47 2002 Manish Singh + + * tests/iochannel-test.c: use gsize instead of int where appropriate + (64-bit cleanliness fix). Removed leftover line_term cruft. + Tue Oct 15 15:07:45 2002 Manish Singh * gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 802c9dd28..04c64f71a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Oct 15 15:28:47 2002 Manish Singh + + * tests/iochannel-test.c: use gsize instead of int where appropriate + (64-bit cleanliness fix). Removed leftover line_term cruft. + Tue Oct 15 15:07:45 2002 Manish Singh * gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 802c9dd28..04c64f71a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Oct 15 15:28:47 2002 Manish Singh + + * tests/iochannel-test.c: use gsize instead of int where appropriate + (64-bit cleanliness fix). Removed leftover line_term cruft. + Tue Oct 15 15:07:45 2002 Manish Singh * gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 802c9dd28..04c64f71a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Oct 15 15:28:47 2002 Manish Singh + + * tests/iochannel-test.c: use gsize instead of int where appropriate + (64-bit cleanliness fix). Removed leftover line_term cruft. + Tue Oct 15 15:07:45 2002 Manish Singh * gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am: diff --git a/tests/iochannel-test.c b/tests/iochannel-test.c index 9c0215060..138c00e00 100644 --- a/tests/iochannel-test.c +++ b/tests/iochannel-test.c @@ -18,9 +18,11 @@ gint main (gint argc, gchar * argv[]) GString *buffer; char *filename; char *srcdir = getenv ("srcdir"); - gint rlength = 0, wlength = 0, length_out, line_term_len; + gint rlength = 0; + glong wlength = 0; + gsize length_out; gboolean block; - const gchar encoding[] = "EUC-JP", line_term[] = "\n"; + const gchar encoding[] = "EUC-JP"; GIOStatus status; GIOFlags flags; @@ -69,7 +71,6 @@ gint main (gint argc, gchar * argv[]) else g_print (" BLOCKING FALSE \n\n"); - line_term_len = strlen (line_term); buffer = g_string_sized_new (BUFFER_SIZE); while (TRUE) @@ -123,7 +124,7 @@ gint main (gint argc, gchar * argv[]) gerr = NULL; } - g_print ("read %d bytes, wrote %d bytes\n", rlength, wlength); + g_print ("read %d bytes, wrote %ld bytes\n", rlength, wlength); g_io_channel_unref(gio_r); g_io_channel_unref(gio_w);