Skip to content

Commit

Permalink
src: introduce USE() for silencing compiler warnings
Browse files Browse the repository at this point in the history 
PR-URL: #17333
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
  • Loading branch information
@addaleax @MylesBorins
addaleax authored and MylesBorins committed Dec 12, 2017
1 parent 45e8df5 commit 6c3f3b2
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 17 deletions.
12 changes: 4 additions & 8 deletions src/async_wrap.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,7 @@ void AsyncWrap::EmitPromiseResolve(Environment* env, double async_id) {
Local<Value> async_id_value = Number::New(env->isolate(), async_id);
Local<Function> fn = env->async_hooks_promise_resolve_function();
FatalTryCatch try_catch(env);
fn->Call(env->context(), Undefined(env->isolate()), 1, &async_id_value)
.FromMaybe(Local<Value>());
USE(fn->Call(env->context(), Undefined(env->isolate()), 1, &async_id_value));
}


Expand Down Expand Up @@ -202,8 +201,7 @@ void AsyncWrap::EmitBefore(Environment* env, double async_id) {
Local<Value> async_id_value = Number::New(env->isolate(), async_id);
Local<Function> fn = env->async_hooks_before_function();
FatalTryCatch try_catch(env);
fn->Call(env->context(), Undefined(env->isolate()), 1, &async_id_value)
.FromMaybe(Local<Value>());
USE(fn->Call(env->context(), Undefined(env->isolate()), 1, &async_id_value));
}


Expand Down Expand Up @@ -233,8 +231,7 @@ void AsyncWrap::EmitAfter(Environment* env, double async_id) {
Local<Value> async_id_value = Number::New(env->isolate(), async_id);
Local<Function> fn = env->async_hooks_after_function();
FatalTryCatch try_catch(env);
fn->Call(env->context(), Undefined(env->isolate()), 1, &async_id_value)
.FromMaybe(Local<Value>());
USE(fn->Call(env->context(), Undefined(env->isolate()), 1, &async_id_value));
}

class PromiseWrap : public AsyncWrap {
Expand Down Expand Up @@ -736,8 +733,7 @@ void AsyncWrap::EmitAsyncInit(Environment* env,
};

FatalTryCatch try_catch(env);
init_fn->Call(env->context(), object, arraysize(argv), argv)
.FromMaybe(Local<Value>());
USE(init_fn->Call(env->context(), object, arraysize(argv), argv));
}


Expand Down
18 changes: 9 additions & 9 deletions src/node_crypto.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1827,7 +1827,7 @@ static Local<Object> X509ToObject(Environment* env, X509* cert) {
String::NewFromUtf8(env->isolate(), mem->data,
String::kNormalString, mem->length));
}
(void) BIO_reset(bio);
USE(BIO_reset(bio));

X509_NAME* issuer_name = X509_get_issuer_name(cert);
if (X509_NAME_print_ex(bio, issuer_name, 0, X509_NAME_FLAGS) > 0) {
Expand All @@ -1836,7 +1836,7 @@ static Local<Object> X509ToObject(Environment* env, X509* cert) {
String::NewFromUtf8(env->isolate(), mem->data,
String::kNormalString, mem->length));
}
(void) BIO_reset(bio);
USE(BIO_reset(bio));

int nids[] = { NID_subject_alt_name, NID_info_access };
Local<String> keys[] = { env->subjectaltname_string(),
Expand All @@ -1863,7 +1863,7 @@ static Local<Object> X509ToObject(Environment* env, X509* cert) {
String::NewFromUtf8(env->isolate(), mem->data,
String::kNormalString, mem->length));

(void) BIO_reset(bio);
USE(BIO_reset(bio));
}

EVP_PKEY* pkey = X509_get_pubkey(cert);
Expand All @@ -1880,7 +1880,7 @@ static Local<Object> X509ToObject(Environment* env, X509* cert) {
info->Set(env->modulus_string(),
String::NewFromUtf8(env->isolate(), mem->data,
String::kNormalString, mem->length));
(void) BIO_reset(bio);
USE(BIO_reset(bio));

uint64_t exponent_word = static_cast<uint64_t>(BN_get_word(e));
uint32_t lo = static_cast<uint32_t>(exponent_word);
Expand All @@ -1894,7 +1894,7 @@ static Local<Object> X509ToObject(Environment* env, X509* cert) {
info->Set(env->exponent_string(),
String::NewFromUtf8(env->isolate(), mem->data,
String::kNormalString, mem->length));
(void) BIO_reset(bio);
USE(BIO_reset(bio));
}

if (pkey != nullptr) {
Expand All @@ -1911,7 +1911,7 @@ static Local<Object> X509ToObject(Environment* env, X509* cert) {
info->Set(env->valid_from_string(),
String::NewFromUtf8(env->isolate(), mem->data,
String::kNormalString, mem->length));
(void) BIO_reset(bio);
USE(BIO_reset(bio));

ASN1_TIME_print(bio, X509_get_notAfter(cert));
BIO_get_mem_ptr(bio, &mem);
Expand Down Expand Up @@ -2889,7 +2889,7 @@ int Connection::HandleBIOError(BIO *bio, const char* func, int rv) {
return rv;

int retry = BIO_should_retry(bio);
(void) retry; // unused if !defined(SSL_PRINT_DEBUG)
USE(retry); // unused if !defined(SSL_PRINT_DEBUG)

if (BIO_should_write(bio)) {
DEBUG_PRINT("[%p] BIO: %s want write. should retry %d\n",
Expand Down Expand Up @@ -5389,7 +5389,7 @@ void ECDH::SetPrivateKey(const FunctionCallbackInfo<Value>& args) {
EC_KEY_set_public_key(ecdh->key_, nullptr);

MarkPopErrorOnReturn mark_pop_error_on_return;
(void) &mark_pop_error_on_return; // Silence compiler warning.
USE(&mark_pop_error_on_return);

const BIGNUM* priv_key = EC_KEY_get0_private_key(ecdh->key_);
CHECK_NE(priv_key, nullptr);
Expand Down Expand Up @@ -5452,7 +5452,7 @@ bool ECDH::IsKeyValidForCurve(const BIGNUM* private_key) {

bool ECDH::IsKeyPairValid() {
MarkPopErrorOnReturn mark_pop_error_on_return;
(void) &mark_pop_error_on_return; // Silence compiler warning.
USE(&mark_pop_error_on_return);
return 1 == EC_KEY_check_key(key_);
}

Expand Down
3 changes: 3 additions & 0 deletions src/util.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,9 @@ class BufferValue : public MaybeStackBuffer<char> {
if (name##_length > 0) \
CHECK_NE(name##_data, nullptr);

// Use this when a variable or parameter is unused in order to explicitly
// silence a compiler warning about that.
template <typename T> inline void USE(T&&) {}

} // namespace node

Expand Down

0 comments on commit 6c3f3b2

Please sign in to comment.