Skip to content

Commit b150c98

Browse files
committed
src: fix -Wempty-body compiler warnings
Turn counter macros into no-op instructions when counters are disabled. Evaluating to nothing makes gcc complain when the macro is used in a conditional. Fixes the following warning: ../src/tls_wrap.cc:320:5: warning: suggest braces around empty body in an 'if' statement [-Wempty-body] NODE_COUNT_NET_BYTES_SENT(write_size_); ^ PR-URL: #974 Reviewed-By: Chris Dickinson <[email protected]>
1 parent 726671c commit b150c98

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

src/node_counters.h

+12-12
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77
#include "node_win32_perfctr_provider.h"
88
#else
99
#define NODE_COUNTER_ENABLED() (false)
10-
#define NODE_COUNT_HTTP_SERVER_REQUEST()
11-
#define NODE_COUNT_HTTP_SERVER_RESPONSE()
12-
#define NODE_COUNT_HTTP_CLIENT_REQUEST()
13-
#define NODE_COUNT_HTTP_CLIENT_RESPONSE()
14-
#define NODE_COUNT_SERVER_CONN_OPEN()
15-
#define NODE_COUNT_SERVER_CONN_CLOSE()
16-
#define NODE_COUNT_NET_BYTES_SENT(bytes)
17-
#define NODE_COUNT_NET_BYTES_RECV(bytes)
18-
#define NODE_COUNT_GET_GC_RAWTIME()
19-
#define NODE_COUNT_GC_PERCENTTIME(percent)
20-
#define NODE_COUNT_PIPE_BYTES_SENT(bytes)
21-
#define NODE_COUNT_PIPE_BYTES_RECV(bytes)
10+
#define NODE_COUNT_GC_PERCENTTIME(percent) do { } while (false)
11+
#define NODE_COUNT_GET_GC_RAWTIME() do { } while (false)
12+
#define NODE_COUNT_HTTP_CLIENT_REQUEST() do { } while (false)
13+
#define NODE_COUNT_HTTP_CLIENT_RESPONSE() do { } while (false)
14+
#define NODE_COUNT_HTTP_SERVER_REQUEST() do { } while (false)
15+
#define NODE_COUNT_HTTP_SERVER_RESPONSE() do { } while (false)
16+
#define NODE_COUNT_NET_BYTES_RECV(bytes) do { } while (false)
17+
#define NODE_COUNT_NET_BYTES_SENT(bytes) do { } while (false)
18+
#define NODE_COUNT_PIPE_BYTES_RECV(bytes) do { } while (false)
19+
#define NODE_COUNT_PIPE_BYTES_SENT(bytes) do { } while (false)
20+
#define NODE_COUNT_SERVER_CONN_CLOSE() do { } while (false)
21+
#define NODE_COUNT_SERVER_CONN_OPEN() do { } while (false)
2222
#endif
2323

2424
#include "v8.h"

0 commit comments

Comments
 (0)