diff options
| author | Mark Stapp <mjs@voltanet.io> | 2019-02-07 19:54:50 +0100 |
|---|---|---|
| committer | Mark Stapp <mjs@voltanet.io> | 2019-02-07 19:54:50 +0100 |
| commit | 6b097e33797e64aa652df19f87cfa00384884a3a (patch) | |
| tree | 72d38ed9ee5c8f555a2e4462df9c072a0f6996c6 /lib/workqueue.c | |
| parent | Merge pull request #3722 from donaldsharp/static_recursive (diff) | |
| download | frr-6b097e33797e64aa652df19f87cfa00384884a3a.tar.xz frr-6b097e33797e64aa652df19f87cfa00384884a3a.zip | |
libs: remove useless static work_queue_free helper
Collapse the old static free function into the actual public
function that was using it (and the only user of it.)
Signed-off-by: Mark Stapp <mjs@voltanet.io>
Diffstat (limited to '')
| -rw-r--r-- | lib/workqueue.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/lib/workqueue.c b/lib/workqueue.c index 93bbc52e3..fa69ec600 100644 --- a/lib/workqueue.c +++ b/lib/workqueue.c @@ -99,11 +99,10 @@ struct work_queue *work_queue_new(struct thread_master *m, return new; } -/* - * Internal helper api; used to be public. - */ -static void work_queue_free_original(struct work_queue *wq) +void work_queue_free_and_null(struct work_queue **wqp) { + struct work_queue *wq = *wqp; + if (wq->thread != NULL) thread_cancel(wq->thread); @@ -117,13 +116,8 @@ static void work_queue_free_original(struct work_queue *wq) XFREE(MTYPE_WORK_QUEUE_NAME, wq->name); XFREE(MTYPE_WORK_QUEUE, wq); - return; -} -void work_queue_free_and_null(struct work_queue **wq) -{ - work_queue_free_original(*wq); - *wq = NULL; + *wqp = NULL; } bool work_queue_is_scheduled(struct work_queue *wq) |