coffee/wepoll
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

src: use '#define's instead of global variables for integer constants

Browse Source 
By doing this, it is no longer necessary to invoke `unused_var()` to
squelch compiler warnings about unused variables that are used only in
`assert()` calls. These `assert()` calls are removed by the preprocessor
in release builds, which causes these warnings.
This commit is contained in:
Bert Belder 2020-06-09 21:08:00 +02:00
parent 1c549c3ab7
commit 98decd24e2
No known key found for this signature in database
GPG Key ID: 7A77887B2E2ED461
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/poll-group.c
View File

@ -10,7 +10,7 @@
#include "util.h" #include "util.h"
#include "win.h" #include "win.h"
static const size_t POLL_GROUP__MAX_GROUP_SIZE = 32; #define POLL_GROUP__MAX_GROUP_SIZE 32
typedef struct poll_group { typedef struct poll_group {
port_state_t* port_state; port_state_t* port_state;

12
src/reflock.c
View File

@ -8,11 +8,11 @@
#include "win.h" #include "win.h"
/* clang-format off */ /* clang-format off */
static const long REFLOCK__REF = (long) 0x00000001; #define REFLOCK__REF ((long) 0x00000001UL)
static const long REFLOCK__REF_MASK = (long) 0x0fffffff; #define REFLOCK__REF_MASK ((long) 0x0fffffffUL)
static const long REFLOCK__DESTROY = (long) 0x10000000; #define REFLOCK__DESTROY ((long) 0x10000000UL)
static const long REFLOCK__DESTROY_MASK = (long) 0xf0000000; #define REFLOCK__DESTROY_MASK ((long) 0xf0000000UL)
static const long REFLOCK__POISON = (long) 0x300dead0; #define REFLOCK__POISON ((long) 0x300dead0UL)
/* clang-format on */ /* clang-format on */
static HANDLE reflock__keyed_event = NULL; static HANDLE reflock__keyed_event = NULL;
@ -49,7 +49,6 @@ void reflock_ref(reflock_t* reflock) {
/* Verify that the counter didn't overflow and the lock isn't destroyed. */ /* Verify that the counter didn't overflow and the lock isn't destroyed. */
assert((state & REFLOCK__DESTROY_MASK) == 0); assert((state & REFLOCK__DESTROY_MASK) == 0);
unused_var(state); unused_var(state);
unused_var(REFLOCK__DESTROY_MASK);
} }
void reflock_unref(reflock_t* reflock) { void reflock_unref(reflock_t* reflock) {
@ -57,7 +56,6 @@ void reflock_unref(reflock_t* reflock) {
/* Verify that the lock was referenced and not already destroyed. */ /* Verify that the lock was referenced and not already destroyed. */
assert((state & REFLOCK__DESTROY_MASK & ~REFLOCK__DESTROY) == 0); assert((state & REFLOCK__DESTROY_MASK & ~REFLOCK__DESTROY) == 0);
unused_var(REFLOCK__DESTROY_MASK);
if (state == REFLOCK__DESTROY) if (state == REFLOCK__DESTROY)
reflock__signal_event(reflock); reflock__signal_event(reflock);

6
src/sock.c
View File

@ -15,9 +15,9 @@
#include "wepoll.h" #include "wepoll.h"
#include "ws.h" #include "ws.h"
static const uint32_t SOCK__KNOWN_EPOLL_EVENTS = #define SOCK__KNOWN_EPOLL_EVENTS \
EPOLLIN | EPOLLPRI | EPOLLOUT | EPOLLERR | EPOLLHUP | EPOLLRDNORM | (EPOLLIN | EPOLLPRI | EPOLLOUT | EPOLLERR | EPOLLHUP | EPOLLRDNORM | \
EPOLLRDBAND | EPOLLWRNORM | EPOLLWRBAND | EPOLLMSG | EPOLLRDHUP; EPOLLRDBAND | EPOLLWRNORM | EPOLLWRBAND | EPOLLMSG | EPOLLRDHUP)
typedef enum sock__poll_status { typedef enum sock__poll_status {
SOCK__POLL_IDLE = 0, SOCK__POLL_IDLE = 0,