luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-03 14:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 547481 – g_data_input_stream_read_line behaves not as stated in the

Browse Source 
2008-11-28  Matthias Clasen  <mclasen@redhat.com>

        Bug 547481 – g_data_input_stream_read_line behaves not as stated in
        the docs

        * gdatainputstream.c (g_data_input_stream_read_line): Behave as
        documented and include the line end in the returned string.
        Pointed out by Paul Pogonyshev.

        * tests/data-input-stream.c: Fix the read_line test to test the
        documented behaviour.



svn path=/trunk/; revision=7694
This commit is contained in:
Matthias Clasen 2008-11-28 07:42:48 +00:00 committed by Matthias Clasen
parent 688b2e0ed2
commit e449a91b98
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gio/ChangeLog
View File

@ -1,3 +1,15 @@
2008-11-28 Matthias Clasen <mclasen@redhat.com>
Bug 547481 – g_data_input_stream_read_line behaves not as stated in
the docs
* gdatainputstream.c (g_data_input_stream_read_line): Behave as
documented and include the line end in the returned string.
Pointed out by Paul Pogonyshev.
* tests/data-input-stream.c: Fix the read_line test to test the
documented behaviour.
2008-11-28 Matthias Clasen <mclasen@redhat.com> 2008-11-28 Matthias Clasen <mclasen@redhat.com>
* gdesktopappinfo.c (g_app_info_can_delete): Only allow deleting * gdesktopappinfo.c (g_app_info_can_delete): Only allow deleting

2
gio/gdatainputstream.c
View File

@ -803,7 +803,7 @@ g_data_input_stream_read_line (GDataInputStream *stream,
if (length) if (length)
*length = (gsize)found_pos; *length = (gsize)found_pos;
g_warn_if_fail (res == found_pos + newline_len); g_warn_if_fail (res == found_pos + newline_len);
line[found_pos] = 0; line[found_pos + newline_len] = 0;
return line; return line;
} }

6
gio/tests/data-input-stream.c
View File

@ -87,8 +87,12 @@ test_read_lines (GDataStreamNewlineType newline_type)
data = g_data_input_stream_read_line (G_DATA_INPUT_STREAM (stream), &length, NULL, &error); data = g_data_input_stream_read_line (G_DATA_INPUT_STREAM (stream), &length, NULL, &error);
if (data) if (data)
{ {
g_assert_cmpstr (data, ==, lines[line]); char *expected;
expected = g_strconcat (lines[line], endl[newline_type], NULL);
g_assert_cmpstr (data, ==, expected);
g_assert_no_error (error); g_assert_no_error (error);
g_free (expected);
line++; line++;
} }
} }