summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@ugent.be>2017-06-04 15:50:44 +0000
committerSander Vrijders <sander.vrijders@ugent.be>2017-06-04 15:50:44 +0000
commitf6fe1151ec5b7cefa7b273059fa254c796c97aec (patch)
tree7f538c1636243c980c003c99b0ffa9a257dad6df /src
parent51aac5614ccd7928ba23af0cca0e94010f3fcebc (diff)
parentbd79660f37a6110d0e53f20cec7a3863c5eff78e (diff)
downloadouroboros-f6fe1151ec5b7cefa7b273059fa254c796c97aec.tar.gz
ouroboros-f6fe1151ec5b7cefa7b273059fa254c796c97aec.zip
Merged in dstaesse/ouroboros/be-gcc7 (pull request #513)
lib, irmd: Handle case fallthrough in gcc 7
Diffstat (limited to 'src')
-rw-r--r--src/irmd/main.c1
-rw-r--r--src/lib/cdap_req.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/irmd/main.c b/src/irmd/main.c
index b3243192..0a88d311 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -1320,6 +1320,7 @@ static struct irm_flow * flow_req_arr(pid_t api,
return NULL;
pthread_rwlock_wrlock(&irmd.reg_lock);
+ /* FALLTHRU */
case REG_NAME_FLOW_ACCEPT:
h_api = reg_entry_get_api(re);
if (h_api == -1) {
diff --git a/src/lib/cdap_req.c b/src/lib/cdap_req.c
index 4eab6fa6..bb11dbf6 100644
--- a/src/lib/cdap_req.c
+++ b/src/lib/cdap_req.c
@@ -126,6 +126,7 @@ int cdap_req_wait(struct cdap_req * creq)
switch(creq->state) {
case REQ_DESTROY:
ret = -1;
+ /* FALLTHRU */
case REQ_PENDING:
creq->state = REQ_NULL;
pthread_cond_broadcast(&creq->cond);