[PATCH 2/2] cms-colord: Warn if reading or writing to the FD failed

Richard Hughes hughsient at gmail.com
Wed May 15 01:17:38 PDT 2013


This also fixes a compile warning when building the tarball.
---
 src/cms-colord.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/cms-colord.c b/src/cms-colord.c
index af6b5fa..6056407 100644
--- a/src/cms-colord.c
+++ b/src/cms-colord.c
@@ -127,6 +127,7 @@ static void
 update_device_with_profile_in_idle(struct cms_output *ocms)
 {
 	gboolean signal_write = FALSE;
+	ssize_t rc;
 	struct cms_colord *cms = ocms->cms;
 
 	colord_idle_cancel_for_output(cms, ocms->o);
@@ -139,7 +140,9 @@ update_device_with_profile_in_idle(struct cms_output *ocms)
 	/* signal we've got updates to do */
 	if (signal_write) {
 		gchar tmp = '\0';
-		write(cms->writefd, &tmp, 1);
+		rc = write(cms->writefd, &tmp, 1);
+		if (rc == 0)
+			weston_log("colord: failed to write to pending fd");
 	}
 }
 
@@ -365,6 +368,7 @@ colord_dispatch_all_pending(int fd, uint32_t mask, void *data)
 {
 	gchar tmp;
 	GList *l;
+	ssize_t rc;
 	struct cms_colord *cms = data;
 	struct cms_output *ocms;
 
@@ -387,7 +391,9 @@ colord_dispatch_all_pending(int fd, uint32_t mask, void *data)
 	g_mutex_unlock(&cms->pending_mutex);
 
 	/* done */
-	read(cms->readfd, &tmp, 1);
+	rc = read(cms->readfd, &tmp, 1);
+	if (rc == 0)
+		weston_log("colord: failed to read from pending fd");
 	return 1;
 }
 
-- 
1.8.2.1



More information about the wayland-devel mailing list