From: Mark Stapp <mjs@voltanet.io>
Date: Thu, 7 Feb 2019 18:54:50 +0000 (-0500)
Subject: libs: remove useless static work_queue_free helper
X-Git-Tag: 7.1_pulled~263^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6b097e33797e64aa652df19f87cfa00384884a3a;p=matthieu%2Ffrr.git

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>
---

diff --git a/lib/workqueue.c b/lib/workqueue.c
index 93bbc52e3b..fa69ec600e 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)