mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cms-colord: Warn if reading or writing to the FD failed

Browse Source 
This also fixes a compile warning when building the tarball.
This commit is contained in:
Richard Hughes 2013-05-15 09:17:38 +01:00 committed by Kristian Høgsberg
parent 2379a65c9f
commit d561687ec8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cms-colord.c
View File

@ -127,6 +127,7 @@ static void
update_device_with_profile_in_idle(struct cms_output *ocms) update_device_with_profile_in_idle(struct cms_output *ocms)
{ {
gboolean signal_write = FALSE; gboolean signal_write = FALSE;
ssize_t rc;
struct cms_colord *cms = ocms->cms; struct cms_colord *cms = ocms->cms;
colord_idle_cancel_for_output(cms, ocms->o); 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 */ /* signal we've got updates to do */
if (signal_write) { if (signal_write) {
gchar tmp = '\0'; 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; gchar tmp;
GList *l; GList *l;
ssize_t rc;
struct cms_colord *cms = data; struct cms_colord *cms = data;
struct cms_output *ocms; 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); g_mutex_unlock(&cms->pending_mutex);
/* done */ /* 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; return 1;
} }