diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-07-14 12:54:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-14 12:54:40 -0400 |
| commit | e553b498f1e691800fd1bd94621350df941f9b44 (patch) | |
| tree | f3ad6501b34fa3e58ced4cad357aeb9c09599eeb /lib/workqueue.c | |
| parent | 9b42781b5de1c5053233666ac7d5d9e553a9f81e (diff) | |
| parent | 33cef919327fe03dbce53a422caccecb3f09faca (diff) | |
Merge pull request #820 from opensourcerouting/gcc7
fix new warnings emitted by GCC 7
Diffstat (limited to 'lib/workqueue.c')
| -rw-r--r-- | lib/workqueue.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/lib/workqueue.c b/lib/workqueue.c index 3600df2f23..60119f1f41 100644 --- a/lib/workqueue.c +++ b/lib/workqueue.c @@ -331,14 +331,14 @@ work_queue_run (struct thread *thread) { item->ran--; work_queue_item_requeue (wq, node); - /* If a single node is being used with a meta-queue (e.g., zebra), - * update the next node as we don't want to exit the thread and - * reschedule it after every node. By definition, WQ_REQUEUE is - * meant to continue the processing; the yield logic will kick in - * to terminate the thread when time has exceeded. - */ - if (nnode == NULL) - nnode = node; + /* If a single node is being used with a meta-queue (e.g., zebra), + * update the next node as we don't want to exit the thread and + * reschedule it after every node. By definition, WQ_REQUEUE is + * meant to continue the processing; the yield logic will kick in + * to terminate the thread when time has exceeded. + */ + if (nnode == NULL) + nnode = node; break; } case WQ_RETRY_NOW: @@ -348,7 +348,7 @@ work_queue_run (struct thread *thread) if (wq->spec.errorfunc) wq->spec.errorfunc (wq, item); } - /* fall through here is deliberate */ + /* fallthru */ case WQ_SUCCESS: default: { |