mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-07-24 10:57:53 +02:00
gio: add GBytes-based input/output stream methods
Using a caller-supplied buffer for g_input_stream_read() doesn't translate well to the semantics of many other languages, and using a non-refcounted buffer for read_async() and write_async() makes it impossible to manage the memory correctly currently in garbage-collected languages. Fix both of these issues by adding a new set of methods that work with GBytes objects rather than plain buffers. https://bugzilla.gnome.org/show_bug.cgi?id=671139
This commit is contained in:
committed by
Jasper St. Pierre
parent
4b456635e4
commit
800d6ff111
@@ -194,6 +194,31 @@ test_truncate (void)
|
||||
g_object_unref (stream);
|
||||
}
|
||||
|
||||
static void
|
||||
test_read_bytes (void)
|
||||
{
|
||||
const char *data1 = "abcdefghijklmnopqrstuvwxyz";
|
||||
const char *data2 = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
|
||||
GInputStream *stream;
|
||||
GError *error = NULL;
|
||||
GBytes *bytes;
|
||||
gsize size;
|
||||
gconstpointer data;
|
||||
|
||||
stream = g_memory_input_stream_new ();
|
||||
g_memory_input_stream_add_data (G_MEMORY_INPUT_STREAM (stream),
|
||||
data1, -1, NULL);
|
||||
g_memory_input_stream_add_data (G_MEMORY_INPUT_STREAM (stream),
|
||||
data2, -1, NULL);
|
||||
|
||||
bytes = g_input_stream_read_bytes (stream, 26, NULL, &error);
|
||||
g_assert_no_error (error);
|
||||
|
||||
data = g_bytes_get_data (bytes, &size);
|
||||
g_assert_cmpint (size, ==, 26);
|
||||
g_assert (strncmp (data, data1, 26) == 0);
|
||||
}
|
||||
|
||||
int
|
||||
main (int argc,
|
||||
char *argv[])
|
||||
@@ -205,6 +230,7 @@ main (int argc,
|
||||
g_test_add_func ("/memory-input-stream/async", test_async);
|
||||
g_test_add_func ("/memory-input-stream/seek", test_seek);
|
||||
g_test_add_func ("/memory-input-stream/truncate", test_truncate);
|
||||
g_test_add_func ("/memory-input-stream/read-bytes", test_read_bytes);
|
||||
|
||||
return g_test_run();
|
||||
}
|
||||
|
Reference in New Issue
Block a user