summaryrefslogtreecommitdiff
path: root/src/ipcpd
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@ugent.be>2017-03-21 16:21:25 +0100
committerSander Vrijders <sander.vrijders@ugent.be>2017-03-21 16:21:25 +0100
commit4b257b249ea91d1ee7e2341c563bac561911e8a6 (patch)
treef45378a6118390d279062577188741ab3d256127 /src/ipcpd
parent8907220599bec8067c1701c3d8bd19f9bcb19275 (diff)
parentb04b4933fc7f03aef940b4de5fd43815834951ca (diff)
downloadouroboros-4b257b249ea91d1ee7e2341c563bac561911e8a6.tar.gz
ouroboros-4b257b249ea91d1ee7e2341c563bac561911e8a6.zip
Merge branch 'testing' into be
Diffstat (limited to 'src/ipcpd')
-rw-r--r--src/ipcpd/shim-data.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/ipcpd/shim-data.c b/src/ipcpd/shim-data.c
index 933f3a64..bec2486c 100644
--- a/src/ipcpd/shim-data.c
+++ b/src/ipcpd/shim-data.c
@@ -492,12 +492,10 @@ int shim_data_dir_query_wait(struct dir_query * query,
query->state = QUERY_PENDING;
- while (query->state == QUERY_PENDING) {
- if ((ret = -pthread_cond_timedwait(&query->cond,
- &query->lock,
- &abstime)) == -ETIMEDOUT)
- break;
- }
+ while (query->state == QUERY_PENDING && ret != -ETIMEDOUT)
+ ret = -pthread_cond_timedwait(&query->cond,
+ &query->lock,
+ &abstime);
if (query->state == QUERY_DESTROY)
ret = -1;