Revise based on initial review feedback.

Author: dgrove-oss

src/queue.c

@@ -160,7 +160,8 @@ struct dispatch_root_queue_context_s {
 #if HAVE_PTHREAD_WORKQUEUES
 			qos_class_t dgq_qos;
 			int dgq_wq_priority, dgq_wq_options;
-#if DISPATCH_USE_LEGACY_WORKQUEUE_FALLBACK || DISPATCH_USE_PTHREAD_POOL || HAVE_INTERNAL_PTHREAD_WORKQUEUE
+#if DISPATCH_USE_LEGACY_WORKQUEUE_FALLBACK || DISPATCH_USE_PTHREAD_POOL || \
+		HAVE_INTERNAL_PTHREAD_WORKQUEUE
 			pthread_workqueue_t dgq_kworkqueue;
 #endif
 #endif // HAVE_PTHREAD_WORKQUEUES
@@ -720,7 +721,8 @@ _dispatch_root_queues_init_workq(int *wq_supported)
 		result = !r;
 	}
 #endif // HAVE_PTHREAD_WORKQUEUE_SETDISPATCH_NP
-#if DISPATCH_USE_LEGACY_WORKQUEUE_FALLBACK || DISPATCH_USE_PTHREAD_POOL || HAVE_INTERNAL_PTHREAD_WORKQUEUE
+#if DISPATCH_USE_LEGACY_WORKQUEUE_FALLBACK || DISPATCH_USE_PTHREAD_POOL || \
+		HAVE_INTERNAL_PTHREAD_WORKQUEUE
 	if (!result) {
 #if DISPATCH_USE_LEGACY_WORKQUEUE_FALLBACK
 		pthread_workqueue_attr_t pwq_attr;
@@ -751,8 +753,9 @@ _dispatch_root_queues_init_workq(int *wq_supported)
 #if HAVE_INTERNAL_PTHREAD_WORKQUEUE
 			if (!disable_wq && qc->dgq_wq_priority != WORKQ_PRIO_INVALID) {
 				int priority = qc->dgq_wq_priority;
-				int overcommit = qc->dgq_wq_options & WORKQ_ADDTHREADS_OPTION_OVERCOMMIT;
-				r = dispatch_workqueue_get_wq(&pwq, priority, overcommit);
+				int overcommit =
+					qc->dgq_wq_options & WORKQ_ADDTHREADS_OPTION_OVERCOMMIT;
+				r = dispatch_workq_get_wq(&pwq, priority, overcommit);
 				(void)dispatch_assume_zero(r);
 				result = result || dispatch_assume(pwq);
 			}
@@ -4288,7 +4291,7 @@ _dispatch_global_queue_poke_slow(dispatch_queue_t dq, unsigned int n)
 #if HAVE_INTERNAL_PTHREAD_WORKQUEUE
 		if (qc->dgq_kworkqueue) {
 			do {
-				r = dispatch_workqueue_additem_np(qc->dgq_kworkqueue,
+				r = dispatch_workq_additem_np(qc->dgq_kworkqueue,
 						_dispatch_worker_thread4, dq);
 				(void)dispatch_assume_zero(r);
 			} while (--i);