C89 fixes from Jens Granseuer (#512849)

2008-01-30  Alexander Larsson  <alexl@redhat.com>

        * tests/data-input-stream.c:
        * tests/data-output-stream.c:
	C89 fixes from Jens Granseuer (#512849)

svn path=/trunk/; revision=6423

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 103f83b..f12056c 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,5 +1,11 @@
 2008-01-30  Alexander Larsson  <alexl@redhat.com>
 
+        * tests/data-input-stream.c:
+        * tests/data-output-stream.c:
+       C89 fixes from Jens Granseuer (#512849)
+
+2008-01-30  Alexander Larsson  <alexl@redhat.com>
+
        * fam/fam-helper.c:
        Fix gamin/fam difference build issue. (#509419)
 

diff --git a/gio/tests/data-input-stream.c b/gio/tests/data-input-stream.c
index 22ca5d2..75ed38c 100644 (file)
--- a/gio/tests/data-input-stream.c
+++ b/gio/tests/data-input-stream.c
@@ -126,6 +126,7 @@ test_read_until (void)
   GError *error = NULL;
   char *data;
   int line;
+  int i;
   
 #define REPEATS                        10   //  number of rounds
 #define DATA_STRING            " part1 # part2 $ part3 % part4 ^"
@@ -136,7 +137,6 @@ test_read_until (void)
   base_stream = g_memory_input_stream_new ();
   stream = G_INPUT_STREAM (g_data_input_stream_new (base_stream));
   
-  int i;
   for (i = 0; i < REPEATS; i++)
     g_memory_input_stream_add_data (G_MEMORY_INPUT_STREAM (base_stream), DATA_STRING, -1, NULL);
   

diff --git a/gio/tests/data-output-stream.c b/gio/tests/data-output-stream.c
index cc40889..876511a 100644 (file)
--- a/gio/tests/data-output-stream.c
+++ b/gio/tests/data-output-stream.c
@@ -38,7 +38,8 @@ test_read_lines (GDataStreamNewlineType newline_type)
   gpointer data;
   char *lines;
   int i;
-  
+  int size;
+
 #define TEST_STRING    "some_text"
   
   const char* endl[4] = {"\n", "\r", "\r\n", "\n"};
@@ -70,7 +71,7 @@ test_read_lines (GDataStreamNewlineType newline_type)
   g_assert_cmpint (g_data_output_stream_get_byte_order (G_DATA_OUTPUT_STREAM (stream)), ==, G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN);
   
   /*  compare data */
-  int size = strlen(data);
+  size = strlen(data);
   g_assert_cmpint (size, <, MAX_LINES_BUFF);
   g_assert_cmpstr ((char*)data, ==, lines);
   
@@ -252,12 +253,12 @@ test_read_int (void)
 {
   GRand *rand;
   gpointer buffer;
+  int i;
   
   rand = g_rand_new ();
   buffer = g_malloc0(MAX_BYTES_BINARY);
   
   /*  Fill in some random data */
-  int i;
   for (i = 0; i < MAX_BYTES_BINARY; i++)
     {
       guchar x = 0;