glib r7720 - in trunk/gio: . tests

[matthiasc svn gnome org]

Author: matthiasc
Date: Mon Dec  1 19:02:58 2008
New Revision: 7720
URL: http://svn.gnome.org/viewvc/glib?rev=7720&view=rev

Log:
Revert behaviour change in g_data_input_stream_read_line


Modified:
   trunk/gio/ChangeLog
   trunk/gio/gdatainputstream.c
   trunk/gio/tests/data-input-stream.c

Modified: trunk/gio/gdatainputstream.c
==============================================================================
--- trunk/gio/gdatainputstream.c	(original)
+++ trunk/gio/gdatainputstream.c	Mon Dec  1 19:02:58 2008
@@ -739,7 +739,7 @@
  * triggering the cancellable object from another thread. If the operation
  * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. 
  * 
- * Returns: a string with the line that was read in (including the newlines).
+ * Returns: a string with the line that was read in (without the newlines).
  * Set @length to a #gsize to get the length of the read line.
  * On an error, it will return %NULL and @error will be set. If there's no
  * content to read, it will still return %NULL, but @error won't be set.
@@ -803,7 +803,7 @@
   if (length)
     *length = (gsize)found_pos;
   g_warn_if_fail (res == found_pos + newline_len);
-  line[found_pos + newline_len] = 0;
+  line[found_pos] = 0;
   
   return line;
 }

Modified: trunk/gio/tests/data-input-stream.c
==============================================================================
--- trunk/gio/tests/data-input-stream.c	(original)
+++ trunk/gio/tests/data-input-stream.c	Mon Dec  1 19:02:58 2008
@@ -87,12 +87,8 @@
       data = g_data_input_stream_read_line (G_DATA_INPUT_STREAM (stream), &length, NULL, &error);
       if (data)
 	{
-          char *expected;
-
-          expected = g_strconcat (lines[line], endl[newline_type], NULL);
-	  g_assert_cmpstr (data, ==, expected);
+	  g_assert_cmpstr (data, ==, lines[line]);
 	  g_assert_no_error (error);
-          g_free (expected);  
 	  line++;
 	}
     }