From 99a73a025cb881983854add49782a35f541b0c19 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 3 Apr 2018 17:55:23 +0300 Subject: [PATCH] Style fixes. --- njs/njs_parser.h | 4 ++-- njs/njs_parser_expression.c | 20 ++++++++++---------- njs/njs_vm.c | 4 +--- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/njs/njs_parser.h b/njs/njs_parser.h index 4e531abe..41ff6588 100644 --- a/njs/njs_parser.h +++ b/njs/njs_parser.h @@ -389,9 +389,9 @@ nxt_bool_t njs_parser_has_side_effect(njs_parser_node_t *node); u_char *njs_parser_trace_handler(nxt_trace_t *trace, nxt_trace_data_t *td, u_char *start); void njs_parser_syntax_error(njs_vm_t *vm, njs_parser_t *parser, - const char* fmt, ...); + const char* fmt, ...); void njs_parser_ref_error(njs_vm_t *vm, njs_parser_t *parser, const char* fmt, - ...); + ...); nxt_int_t njs_generate_scope(njs_vm_t *vm, njs_parser_t *parser, njs_parser_node_t *node); diff --git a/njs/njs_parser_expression.c b/njs/njs_parser_expression.c index 2d7c29b6..28b53ce1 100644 --- a/njs/njs_parser_expression.c +++ b/njs/njs_parser_expression.c @@ -873,11 +873,11 @@ njs_parser_inc_dec_expression(njs_vm_t *vm, njs_parser_t *parser, node->left = parser->node; parser->node = node; - parser->code_size += (node->token == NJS_TOKEN_NAME) ? - sizeof(njs_vmcode_3addr_t): - sizeof(njs_vmcode_prop_get_t) - + sizeof(njs_vmcode_3addr_t) - + sizeof(njs_vmcode_prop_set_t); + parser->code_size += (token == NJS_TOKEN_NAME) + ? sizeof(njs_vmcode_3addr_t) + : sizeof(njs_vmcode_prop_get_t) + + sizeof(njs_vmcode_3addr_t) + + sizeof(njs_vmcode_prop_set_t); return next; } @@ -929,11 +929,11 @@ njs_parser_post_inc_dec_expression(njs_vm_t *vm, njs_parser_t *parser, node->left = parser->node; parser->node = node; - parser->code_size += (parser->node->token == NJS_TOKEN_NAME) ? - sizeof(njs_vmcode_3addr_t): - sizeof(njs_vmcode_prop_get_t) - + sizeof(njs_vmcode_3addr_t) - + sizeof(njs_vmcode_prop_set_t); + parser->code_size += (token == NJS_TOKEN_NAME) + ? sizeof(njs_vmcode_3addr_t) + : sizeof(njs_vmcode_prop_get_t) + + sizeof(njs_vmcode_3addr_t) + + sizeof(njs_vmcode_prop_set_t); return njs_parser_token(parser); } diff --git a/njs/njs_vm.c b/njs/njs_vm.c index 4bd93b37..87b0cdcf 100644 --- a/njs/njs_vm.c +++ b/njs/njs_vm.c @@ -2394,9 +2394,7 @@ njs_vmcode_method_frame(njs_vm_t *vm, njs_value_t *object, njs_value_t *name) break; case NXT_ERROR: - - /* An exception was set in njs_property_query(). */ - + /* An exception was set in njs_property_query(). */ return NXT_ERROR; default: -- 2.47.3