From 28032382bce40392a98dd5ec71443a6f2bee7f27 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 11 Feb 2011 10:56:41 +0000 Subject: [PATCH] testdisplay: Remove deprecated GIO functions Signed-off-by: Chris Wilson --- tests/testdisplay.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/testdisplay.c b/tests/testdisplay.c index 5a422264..6f3f5ede 100644 --- a/tests/testdisplay.c +++ b/tests/testdisplay.c @@ -684,7 +684,11 @@ static gboolean hotplug_event(GIOChannel *source, GIOCondition condition, struct stat s; const char *hotplug; - g_io_channel_read(source, buf, 256, &count); + /* drain all pending events */ + do { + count = read(g_io_channel_unix_get_fd(source), + buf, sizeof(buf)); + } while (count > 0); dev = udev_monitor_receive_device(uevent_monitor); if (!dev) @@ -710,9 +714,7 @@ static gboolean input_event(GIOChannel *source, GIOCondition condition, gchar buf[256]; gsize count; - g_io_channel_read(source, buf, 255, &count); - buf[count] = '\0'; - + count = read(g_io_channel_unix_get_fd(source), buf, sizeof(buf)); if (buf[0] == 'q' && (count == 1 || buf[1] == '\n')) exit(0);