mostly address review comments; one more fix coming.

Author: dgrove-oss

src/data.c

@@ -129,9 +129,6 @@ static void
 _dispatch_data_destroy_buffer(const void* buffer, size_t size,
 		dispatch_queue_t queue, dispatch_block_t destructor)
 {
-#if !HAVE_MACH
-	(void)size;
-#endif
 	if (destructor == DISPATCH_DATA_DESTRUCTOR_FREE) {
 		free((void*)buffer);
 	} else if (destructor == DISPATCH_DATA_DESTRUCTOR_NONE) {
@@ -141,6 +138,8 @@ _dispatch_data_destroy_buffer(const void* buffer, size_t size,
 		mach_vm_size_t vm_size = size;
 		mach_vm_address_t vm_addr = (uintptr_t)buffer;
 		mach_vm_deallocate(mach_task_self(), vm_addr, vm_size);
+#else
+		(void)size;
 #endif
 	} else {
 		if (!queue) {

src/event/event_epoll.c

@@ -85,29 +85,29 @@ static struct dispatch_epoll_timeout_s _dispatch_epoll_timeout[] = {
 
 DISPATCH_ALWAYS_INLINE
 static inline struct dispatch_muxnote_bucket_s *
-_dispatch_muxnote_bucket(int ident)
+_dispatch_muxnote_bucket(uint32_t ident)
 {
-	return &_dispatch_sources[DSL_HASH((uint32_t)ident)];
+	return &_dispatch_sources[DSL_HASH(ident)];
 }
 #define _dispatch_unote_muxnote_bucket(du) \
-	_dispatch_muxnote_bucket((int)du._du->du_ident)
+	_dispatch_muxnote_bucket(du._du->du_ident)
 
 DISPATCH_ALWAYS_INLINE
 static inline dispatch_muxnote_t
 _dispatch_muxnote_find(struct dispatch_muxnote_bucket_s *dmb,
-		int ident, int16_t filter)
+		uint32_t ident, int16_t filter)
 {
 	dispatch_muxnote_t dmn;
 	if (filter == EVFILT_WRITE) filter = EVFILT_READ;
 	TAILQ_FOREACH(dmn, dmb, dmn_list) {
-		if (dmn->dmn_ident == ident && dmn->dmn_filter == filter) {
+		if (dmn->dmn_ident == (int)ident && dmn->dmn_filter == filter) {
 			break;
 		}
 	}
 	return dmn;
 }
 #define _dispatch_unote_muxnote_find(dmb, du) \
-		_dispatch_muxnote_find(dmb, (int)du._du->du_ident, du._du->du_filter)
+		_dispatch_muxnote_find(dmb, du._du->du_ident, du._du->du_filter)
 
 static void
 _dispatch_muxnote_dispose(dispatch_muxnote_t dmn)
@@ -148,11 +148,12 @@ _dispatch_muxnote_create(dispatch_unote_t du, uint32_t events)
 	sigset_t sigmask;
 
 	switch (filter) {
-	case EVFILT_SIGNAL:
-		if (!sigismember(&signals_with_unotes, (int)du._du->du_ident)) {
+	case EVFILT_SIGNAL: {
+		int signo = (int)du._du->du_ident;
+		if (!sigismember(&signals_with_unotes, signo)) {
 			manager_thread = pthread_self();
-			sigaddset(&signals_with_unotes, (int)du._du->du_ident);
-			sigaction((int)du._du->du_ident, &sa, NULL);
+			sigaddset(&signals_with_unotes, signo);
+			sigaction(signo, &sa, NULL);
 		}
 		sigemptyset(&sigmask);
 		sigaddset(&sigmask, (int)du._du->du_ident);
@@ -161,7 +162,7 @@ _dispatch_muxnote_create(dispatch_unote_t du, uint32_t events)
 			return NULL;
 		}
 		break;
-
+	}
 	case EVFILT_WRITE:
 		filter = EVFILT_READ;
 	case EVFILT_READ:
@@ -350,7 +351,8 @@ _dispatch_event_merge_timer(dispatch_clock_t clock)
 }
 
 static void
-_dispatch_timeout_program(uint32_t tidx, uint64_t target, DISPATCH_UNUSED uint64_t leeway)
+_dispatch_timeout_program(uint32_t tidx, uint64_t target,
+		DISPATCH_UNUSED uint64_t leeway)
 {
 	dispatch_clock_t clock = DISPATCH_TIMER_CLOCK(tidx);
 	dispatch_epoll_timeout_t timer = &_dispatch_epoll_timeout[clock];

src/init.c

@@ -614,13 +614,13 @@ _dispatch_bug(size_t line, long val)
 			_dispatch_build, (unsigned long)line, val);
 }
 
-#if HAVE_MACH
 void
 _dispatch_bug_client(const char* msg)
 {
 	_dispatch_bug_log("BUG in libdispatch client: %s", msg);
 }
 
+#if HAVE_MACH
 void
 _dispatch_bug_mach_client(const char* msg, mach_msg_return_t kr)
 {

src/internal.h

@@ -394,9 +394,9 @@ DISPATCH_EXPORT DISPATCH_NOTHROW void dispatch_atfork_child(void);
 DISPATCH_EXPORT DISPATCH_NOINLINE
 void _dispatch_bug(size_t line, long val);
 
-#if HAVE_MACH
 DISPATCH_NOINLINE
 void _dispatch_bug_client(const char* msg);
+#if HAVE_MACH
 DISPATCH_NOINLINE
 void _dispatch_bug_mach_client(const char *msg, mach_msg_return_t kr);
 #endif // HAVE_MACH
@@ -466,7 +466,9 @@ void _dispatch_log(const char *msg, ...);
 		} \
 	} while (0)
 #else
-static inline void _dispatch_assert(long e, size_t line) {
+static inline void
+_dispatch_assert(long e, size_t line)
+{
 	if (DISPATCH_DEBUG && !e) _dispatch_abort(line, e);
 }
 #define dispatch_assert(e) _dispatch_assert((long)(e), __LINE__)
@@ -488,7 +490,9 @@ static inline void _dispatch_assert(long e, size_t line) {
 		} \
 	} while (0)
 #else
-static inline void _dispatch_assert_zero(long e, size_t line) {
+static inline void
+_dispatch_assert_zero(long e, size_t line)
+{
 	if (DISPATCH_DEBUG && e) _dispatch_abort(line, e);
 }
 #define dispatch_assert_zero(e) _dispatch_assert_zero((long)(e), __LINE__)
@@ -512,7 +516,9 @@ static inline void _dispatch_assert_zero(long e, size_t line) {
 		_e; \
 	})
 #else
-static inline long _dispatch_assume(long e, long line) {
+static inline long
+_dispatch_assume(long e, long line)
+{
 	if (!e) _dispatch_bug(line, e);
 	return e;
 }
@@ -535,7 +541,9 @@ static inline long _dispatch_assume(long e, long line) {
 		_e; \
 	})
 #else
-static inline long _dispatch_assume_zero(long e, long line) {
+static inline long
+_dispatch_assume_zero(long e, long line)
+{
 	if (e) _dispatch_bug(line, e);
 	return e;
 }
@@ -850,7 +858,7 @@ _dispatch_ktrace_impl(uint32_t code, uint64_t a, uint64_t b,
 #define _dispatch_hardware_crash() \
 		__asm__(""); __builtin_trap() // <rdar://problem/17464981>
 
-#define _dispatch_set_crash_log_cause_and_message(ac, msg)
+#define _dispatch_set_crash_log_cause_and_message(ac, msg) ((void)(ac))
 #define _dispatch_set_crash_log_message(msg)
 #define _dispatch_set_crash_log_message_dynamic(msg)
 

src/io.c

@@ -2167,7 +2167,7 @@ _dispatch_operation_advise(dispatch_operation_t op, size_t chunk_size)
 	op->advise_offset += advise.ra_count;
 #ifdef __linux__
 	_dispatch_io_syscall_switch(err,
-								readahead(op->fd_entry->fd, advise.ra_offset, (size_t)advise.ra_count),
+			readahead(op->fd_entry->fd, advise.ra_offset, (size_t)advise.ra_count),
 		case EINVAL: break; // fd does refer to a non-supported filetype
 		default: (void)dispatch_assume_zero(err); break;
 	);

src/queue.c

@@ -5329,8 +5329,9 @@ _dispatch_root_queue_push(dispatch_queue_t rq, dispatch_object_t dou,
 	if (_dispatch_root_queue_push_needs_override(rq, qos)) {
 		return _dispatch_root_queue_push_override(rq, dou, qos);
 	}
-#endif
+#else
 	(void)qos;
+#endif
 	_dispatch_root_queue_push_inline(rq, dou, dou, 1);
 }
 
@@ -6221,7 +6222,6 @@ DISPATCH_NORETURN
 static void
 _dispatch_deferred_items_cleanup(void *ctxt)
 {
-	(void)ctxt;
 	// POSIX defines that destructors are only called if 'ctxt' is non-null
 	DISPATCH_INTERNAL_CRASH(ctxt,
 			"Premature thread exit with unhandled deferred items");
@@ -6231,7 +6231,6 @@ DISPATCH_NORETURN
 static void
 _dispatch_frame_cleanup(void *ctxt)
 {
-	(void)ctxt;
 	// POSIX defines that destructors are only called if 'ctxt' is non-null
 	DISPATCH_INTERNAL_CRASH(ctxt,
 			"Premature thread exit while a dispatch frame is active");
@@ -6241,7 +6240,6 @@ DISPATCH_NORETURN
 static void
 _dispatch_context_cleanup(void *ctxt)
 {
-	(void)ctxt;
 	// POSIX defines that destructors are only called if 'ctxt' is non-null
 	DISPATCH_INTERNAL_CRASH(ctxt,
 			"Premature thread exit while a dispatch context is set");

src/voucher.c

@@ -1550,7 +1550,7 @@ _voucher_create_accounting_voucher(voucher_t voucher)
 	return NULL;
 }
 
-#if __has_include(<mach/mach.h>)
+#if HAVE_MACH
 voucher_t
 voucher_create_with_mach_msg(mach_msg_header_t *msg)
 {