util: rename 'unused' macro to 'unused_var'

This commit is contained in:
Bert Belder 2017-12-08 19:20:42 +01:00
parent 05c384b181
commit 1ad34ec3f3
4 changed files with 10 additions and 10 deletions

View File

@ -25,9 +25,9 @@ static int _winsock_global_init(void) {
static BOOL CALLBACK _init_once_callback(INIT_ONCE* once, static BOOL CALLBACK _init_once_callback(INIT_ONCE* once,
void* parameter, void* parameter,
void** context) { void** context) {
unused(once); unused_var(once);
unused(parameter); unused_var(parameter);
unused(context); unused_var(context);
if (_winsock_global_init() < 0 || nt_global_init() < 0 || if (_winsock_global_init() < 0 || nt_global_init() < 0 ||
reflock_global_init() < 0 || api_global_init() < 0) reflock_global_init() < 0 || api_global_init() < 0)

View File

@ -385,7 +385,7 @@ poll_group_t* ep_port_acquire_poll_group(
void ep_port_release_poll_group(ep_port_t* port_info, void ep_port_release_poll_group(ep_port_t* port_info,
poll_group_t* poll_group) { poll_group_t* poll_group) {
unused(port_info); unused_var(port_info);
poll_group_release(poll_group); poll_group_release(poll_group);
} }
@ -397,7 +397,7 @@ void ep_port_request_socket_update(ep_port_t* port_info,
} }
void ep_port_cancel_socket_update(ep_port_t* port_info, ep_sock_t* sock_info) { void ep_port_cancel_socket_update(ep_port_t* port_info, ep_sock_t* sock_info) {
unused(port_info); unused_var(port_info);
if (!queue_enqueued(&sock_info->queue_node)) if (!queue_enqueued(&sock_info->queue_node))
return; return;
queue_remove(&sock_info->queue_node); queue_remove(&sock_info->queue_node);
@ -411,7 +411,7 @@ void ep_port_add_deleted_socket(ep_port_t* port_info, ep_sock_t* sock_info) {
void ep_port_remove_deleted_socket(ep_port_t* port_info, void ep_port_remove_deleted_socket(ep_port_t* port_info,
ep_sock_t* sock_info) { ep_sock_t* sock_info) {
unused(port_info); unused_var(port_info);
if (!queue_enqueued(&sock_info->queue_node)) if (!queue_enqueued(&sock_info->queue_node))
return; return;
queue_remove(&sock_info->queue_node); queue_remove(&sock_info->queue_node);

View File

@ -64,7 +64,7 @@ static inline uint32_t _sync_fetch_and_set(volatile uint32_t* target,
void reflock_ref(reflock_t* reflock) { void reflock_ref(reflock_t* reflock) {
uint32_t state = _sync_add_and_fetch(&reflock->state, _REF); uint32_t state = _sync_add_and_fetch(&reflock->state, _REF);
unused(state); unused_var(state);
assert((state & _DESTROY_MASK) == 0); /* Overflow or destroyed. */ assert((state & _DESTROY_MASK) == 0); /* Overflow or destroyed. */
} }
@ -73,8 +73,8 @@ void reflock_unref(reflock_t* reflock) {
uint32_t ref_count = state & _REF_MASK; uint32_t ref_count = state & _REF_MASK;
uint32_t destroy = state & _DESTROY_MASK; uint32_t destroy = state & _DESTROY_MASK;
unused(ref_count); unused_var(ref_count);
unused(destroy); unused_var(destroy);
if (state == _DESTROY) if (state == _DESTROY)
_signal_event(reflock); _signal_event(reflock);

View File

@ -18,7 +18,7 @@ typedef intptr_t ssize_t;
#define safe_container_of(ptr, type, member) \ #define safe_container_of(ptr, type, member) \
((type*) util_safe_container_of_helper((ptr), offsetof(type, member))) ((type*) util_safe_container_of_helper((ptr), offsetof(type, member)))
#define unused(v) ((void) (v)) #define unused_var(v) ((void) (v))
#if defined(_MSC_VER) && _MSC_VER < 1900 #if defined(_MSC_VER) && _MSC_VER < 1900
/* Polyfill `inline` for msvc 12 (Visual Studio 2013) */ /* Polyfill `inline` for msvc 12 (Visual Studio 2013) */