diff options
| author | Mark Stapp <mjs@voltanet.io> | 2019-02-06 12:11:19 -0500 |
|---|---|---|
| committer | Mark Stapp <mjs@voltanet.io> | 2019-02-06 14:13:21 -0500 |
| commit | 49f36252d60195112caada649d94cce3bb9d496e (patch) | |
| tree | be2adc407c5e57da02db65b1bbcf8c08418f5800 /lib | |
| parent | 4634d02cfd86685156b29c8084a979749efe15e2 (diff) | |
libs: remove deprecated workqueue api
Remove deprecated api from workqueue module.
Signed-off-by: Mark Stapp <mjs@voltanet.io>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/workqueue.c | 5 | ||||
| -rw-r--r-- | lib/workqueue.h | 13 |
2 files changed, 6 insertions, 12 deletions
diff --git a/lib/workqueue.c b/lib/workqueue.c index 24ef24c774..93bbc52e3b 100644 --- a/lib/workqueue.c +++ b/lib/workqueue.c @@ -99,7 +99,10 @@ struct work_queue *work_queue_new(struct thread_master *m, return new; } -void work_queue_free_original(struct work_queue *wq) +/* + * Internal helper api; used to be public. + */ +static void work_queue_free_original(struct work_queue *wq) { if (wq->thread != NULL) thread_cancel(wq->thread); diff --git a/lib/workqueue.h b/lib/workqueue.h index 7c84655063..cbbacc0561 100644 --- a/lib/workqueue.h +++ b/lib/workqueue.h @@ -159,19 +159,10 @@ extern struct work_queue *work_queue_new(struct thread_master *, const char *); * The usage of work_queue_free is being transitioned to pass * in the double pointer to remove use after free's. */ -#if CONFDATE > 20190205 -CPP_NOTICE("work_queue_free without double pointer is deprecated, please fixup") -#endif -extern void work_queue_free_and_null(struct work_queue **); -extern void work_queue_free_original(struct work_queue *); -#define work_queue_free(X) \ - do { \ - work_queue_free_original((X)); \ - CPP_WARN("Please use work_queue_free_and_null"); \ - } while (0) +extern void work_queue_free_and_null(struct work_queue **wqp); /* Add the supplied data as an item onto the workqueue */ -extern void work_queue_add(struct work_queue *, void *); +extern void work_queue_add(struct work_queue *wq, void *item); /* plug the queue, ie prevent it from being drained / processed */ extern void work_queue_plug(struct work_queue *wq); |