use gsize instead of int where appropriate (64-bit cleanliness fix).

Tue Oct 15 15:28:47 2002  Manish Singh  <yosh@gimp.org>

        * tests/iochannel-test.c: use gsize instead of int where appropriate
        (64-bit cleanliness fix). Removed leftover line_term cruft.

diff --git a/ChangeLog b/ChangeLog
index 802c9dd..04c64f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 15 15:28:47 2002  Manish Singh  <yosh@gimp.org>
+
+       * 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  <yosh@gimp.org>
 
        * gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 802c9dd..04c64f7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Oct 15 15:28:47 2002  Manish Singh  <yosh@gimp.org>
+
+       * 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  <yosh@gimp.org>
 
        * gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am:

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 802c9dd..04c64f7 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+Tue Oct 15 15:28:47 2002  Manish Singh  <yosh@gimp.org>
+
+       * 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  <yosh@gimp.org>
 
        * gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 802c9dd..04c64f7 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Tue Oct 15 15:28:47 2002  Manish Singh  <yosh@gimp.org>
+
+       * 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  <yosh@gimp.org>
 
        * gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 802c9dd..04c64f7 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Oct 15 15:28:47 2002  Manish Singh  <yosh@gimp.org>
+
+       * 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  <yosh@gimp.org>
 
        * gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 802c9dd..04c64f7 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Oct 15 15:28:47 2002  Manish Singh  <yosh@gimp.org>
+
+       * 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  <yosh@gimp.org>
 
        * gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 802c9dd..04c64f7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Oct 15 15:28:47 2002  Manish Singh  <yosh@gimp.org>
+
+       * 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  <yosh@gimp.org>
 
        * gmodule/Makefile.am gobject/Makefile.am gthread/Makefile.am:

diff --git a/tests/iochannel-test.c b/tests/iochannel-test.c
index 9c02150..138c00e 100644 (file)
--- 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);