diff options
| -rw-r--r-- | ext/openssl/ossl_pkey.h | 10 | ||||
| -rw-r--r-- | ext/openssl/ossl_pkey_dh.c | 2 | ||||
| -rw-r--r-- | signal.c | 2 | ||||
| -rw-r--r-- | vm_insnhelper.c | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/ext/openssl/ossl_pkey.h b/ext/openssl/ossl_pkey.h index 8b2fe36315..0db59305f7 100644 --- a/ext/openssl/ossl_pkey.h +++ b/ext/openssl/ossl_pkey.h @@ -133,9 +133,9 @@ static VALUE ossl_##_keytype##_set_##_group(VALUE self, VALUE v1, VALUE v2, VALU BIGNUM *bn3 = NULL, *orig_bn3 = NIL_P(v3) ? NULL : GetBNPtr(v3);\ \ Get##_type(self, obj); \ - if ((orig_bn1 && !(bn1 = BN_dup(orig_bn1))) || \ - (orig_bn2 && !(bn2 = BN_dup(orig_bn2))) || \ - (orig_bn3 && !(bn3 = BN_dup(orig_bn3)))) { \ + if ((orig_bn1 && !(bn1 = BN_dup(orig_bn1))) || \ + (orig_bn2 && !(bn2 = BN_dup(orig_bn2))) || \ + (orig_bn3 && !(bn3 = BN_dup(orig_bn3)))) { \ BN_clear_free(bn1); \ BN_clear_free(bn2); \ BN_clear_free(bn3); \ @@ -163,8 +163,8 @@ static VALUE ossl_##_keytype##_set_##_group(VALUE self, VALUE v1, VALUE v2) \ BIGNUM *bn2 = NULL, *orig_bn2 = NIL_P(v2) ? NULL : GetBNPtr(v2);\ \ Get##_type(self, obj); \ - if ((orig_bn1 && !(bn1 = BN_dup(orig_bn1))) || \ - (orig_bn2 && !(bn2 = BN_dup(orig_bn2)))) { \ + if ((orig_bn1 && !(bn1 = BN_dup(orig_bn1))) || \ + (orig_bn2 && !(bn2 = BN_dup(orig_bn2)))) { \ BN_clear_free(bn1); \ BN_clear_free(bn2); \ ossl_raise(eBNError, NULL); \ diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c index 63fc939f2f..bf4e3f9322 100644 --- a/ext/openssl/ossl_pkey_dh.c +++ b/ext/openssl/ossl_pkey_dh.c @@ -262,7 +262,7 @@ ossl_dh_initialize_copy(VALUE self, VALUE other) BIGNUM *pub2 = BN_dup(pub); BIGNUM *priv2 = BN_dup(priv); - if (!pub2 || (priv && !priv2)) { + if (!pub2 || (priv && !priv2)) { BN_clear_free(pub2); BN_clear_free(priv2); ossl_raise(eDHError, "BN_dup"); @@ -886,7 +886,7 @@ check_stack_overflow(int sig, const uintptr_t addr, const ucontext_t *ctx) /* SP in ucontext is not decremented yet when `push` failed, so * the fault page can be the next. */ if (sp_page == fault_page || sp_page == fault_page + 1 || - (sp_page <= fault_page && fault_page <= bp_page)) { + (sp_page <= fault_page && fault_page <= bp_page)) { rb_execution_context_t *ec = GET_EC(); int crit = FALSE; if ((uintptr_t)ec->tag->buf / pagesize <= fault_page + 1) { diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 454eaa438b..9fbc116b61 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -3868,7 +3868,7 @@ vm_trace(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, const VALUE *p VM_ASSERT(vm_event_flags & events); /* increment PC because source line is calculated with PC-1 */ - if ((event = (events & (RUBY_EVENT_CLASS | RUBY_EVENT_CALL | RUBY_EVENT_B_CALL))) != 0) { + if ((event = (events & (RUBY_EVENT_CLASS | RUBY_EVENT_CALL | RUBY_EVENT_B_CALL))) != 0) { VM_ASSERT(event == RUBY_EVENT_CLASS || event == RUBY_EVENT_CALL || event == RUBY_EVENT_B_CALL); @@ -3889,7 +3889,7 @@ vm_trace(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, const VALUE *p EXEC_EVENT_HOOK(ec, RUBY_EVENT_COVERAGE_LINE, GET_SELF(), 0, 0, 0, Qundef); reg_cfp->pc--; } - if ((event = (events & (RUBY_EVENT_END | RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN))) != 0) { + if ((event = (events & (RUBY_EVENT_END | RUBY_EVENT_RETURN | RUBY_EVENT_B_RETURN))) != 0) { VM_ASSERT(event == RUBY_EVENT_END || event == RUBY_EVENT_RETURN || event == RUBY_EVENT_B_RETURN); |