[njs] Style fixes.

[Igor Sysoev]

details:   http://hg.nginx.org/njs/rev/c1f9fe4022bc
branches:  
changeset: 553:c1f9fe4022bc
user:  Igor Sysoev 
date:  Tue Jul 03 15:48:04 2018 +0300
description:
Style fixes.

diffstat:

 njs/njs_error.h  |  3 ++-
 njs/njs_fs.c |  4 ++--
 njs/njs_object.c |  3 ++-
 njs/njs_string.c |  4 ++--
 njs/njs_string.h |  4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diffs (69 lines):

diff -r 3aef480987d6 -r c1f9fe4022bc njs/njs_error.h
--- a/njs/njs_error.h   Tue Jul 03 15:48:03 2018 +0300
+++ b/njs/njs_error.h   Tue Jul 03 15:48:04 2018 +0300
@@ -13,7 +13,8 @@
 #define njs_eval_error(vm, fmt, ...)  \
 njs_exception_error_create(vm, NJS_OBJECT_EVAL_ERROR, fmt, ##__VA_ARGS__)
 #define njs_internal_error(vm, fmt, ...)  \
-njs_exception_error_create(vm, NJS_OBJECT_INTERNAL_ERROR, fmt, 
##__VA_ARGS__)
+njs_exception_error_create(vm, NJS_OBJECT_INTERNAL_ERROR, fmt,\
+   ##__VA_ARGS__)
 #define njs_range_error(vm, fmt, ...) \
 njs_exception_error_create(vm, NJS_OBJECT_RANGE_ERROR, fmt, ##__VA_ARGS__)
 #define njs_reference_error(vm, fmt, ...) \
diff -r 3aef480987d6 -r c1f9fe4022bc njs/njs_fs.c
--- a/njs/njs_fs.c  Tue Jul 03 15:48:03 2018 +0300
+++ b/njs/njs_fs.c  Tue Jul 03 15:48:04 2018 +0300
@@ -43,8 +43,8 @@ static njs_ret_t njs_fs_write_file_sync(
 nxt_uint_t nargs, njs_index_t unused);
 static njs_ret_t njs_fs_write_file_internal(njs_vm_t *vm, njs_value_t *args,
 nxt_uint_t nargs, int default_flags);
-static njs_ret_t njs_fs_write_file_sync_internal(njs_vm_t *vm, njs_value_t 
*args,
-nxt_uint_t nargs, int default_flags);
+static njs_ret_t njs_fs_write_file_sync_internal(njs_vm_t *vm,
+njs_value_t *args, nxt_uint_t nargs, int default_flags);
 static njs_ret_t njs_fs_done(njs_vm_t *vm, njs_value_t *args,
 nxt_uint_t nargs, njs_index_t unused);
 
diff -r 3aef480987d6 -r c1f9fe4022bc njs/njs_object.c
--- a/njs/njs_object.c  Tue Jul 03 15:48:03 2018 +0300
+++ b/njs/njs_object.c  Tue Jul 03 15:48:04 2018 +0300
@@ -631,7 +631,8 @@ njs_object_keys(njs_vm_t *vm, njs_value_
 return NXT_OK;
 }
 
-njs_array_t*
+
+njs_array_t *
 njs_object_keys_array(njs_vm_t *vm, const njs_value_t *object)
 {
 size_t size;
diff -r 3aef480987d6 -r c1f9fe4022bc njs/njs_string.c
--- a/njs/njs_string.c  Tue Jul 03 15:48:03 2018 +0300
+++ b/njs/njs_string.c  Tue Jul 03 15:48:04 2018 +0300
@@ -716,8 +716,8 @@ njs_string_prototype_value_of(njs_vm_t *
  */
 
 static njs_ret_t
-njs_string_prototype_to_string(njs_vm_t *vm, njs_value_t *args, nxt_uint_t 
nargs,
-njs_index_t unused)
+njs_string_prototype_to_string(njs_vm_t *vm, njs_value_t *args,
+nxt_uint_t nargs, njs_index_t unused)
 {
 nxt_int_t  ret;
 nxt_str_t  enc, str;
diff -r 3aef480987d6 -r c1f9fe4022bc njs/njs_string.h
--- a/njs/njs_string.h  Tue Jul 03 15:48:03 2018 +0300
+++ b/njs/njs_string.h  Tue Jul 03 15:48:04 2018 +0300
@@ -126,9 +126,9 @@ njs_ret_t njs_string_new(njs_vm_t *vm, n
 njs_ret_t njs_string_hex(njs_vm_t *vm, njs_value_t *value,
 const nxt_str_t *src);
 njs_ret_t njs_string_base64(njs_vm_t *vm, njs_value_t *value,
-   const nxt_str_t *src);
+const nxt_str_t *src);
 njs_ret_t njs_string_base64url(njs_vm_t *vm, njs_value_t *value,
-   const nxt_str_t *src);
+const nxt_str_t *src);
 void njs_string_copy(njs_value_t *dst, njs_value_t *src);
 njs_ret_t njs_string_validate(njs_vm_t *vm, njs_string_prop_t *string,
 njs_value_t *value);
___
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel

[njs] Style fixes.

[Igor Sysoev]

details:   http://hg.nginx.org/njs/rev/39374a5d6cda
branches:  
changeset: 489:39374a5d6cda
user:  Igor Sysoev 
date:  Tue Apr 03 17:55:23 2018 +0300
description:
Style fixes.

diffstat:

 njs/njs_parser.h|   4 ++--
 njs/njs_parser_expression.c |  20 ++--
 njs/njs_vm.c|   4 +---
 3 files changed, 13 insertions(+), 15 deletions(-)

diffs (66 lines):

diff -r addefc71957b -r 39374a5d6cda njs/njs_parser.h
--- a/njs/njs_parser.h  Tue Apr 03 17:55:08 2018 +0300
+++ b/njs/njs_parser.h  Tue Apr 03 17:55:23 2018 +0300
@@ -389,9 +389,9 @@ nxt_bool_t njs_parser_has_side_effect(nj
 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 -r addefc71957b -r 39374a5d6cda njs/njs_parser_expression.c
--- a/njs/njs_parser_expression.c   Tue Apr 03 17:55:08 2018 +0300
+++ b/njs/njs_parser_expression.c   Tue Apr 03 17:55:23 2018 +0300
@@ -873,11 +873,11 @@ njs_parser_inc_dec_expression(njs_vm_t *
 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_v
 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 -r addefc71957b -r 39374a5d6cda njs/njs_vm.c
--- a/njs/njs_vm.c  Tue Apr 03 17:55:08 2018 +0300
+++ b/njs/njs_vm.c  Tue Apr 03 17:55:23 2018 +0300
@@ -2394,9 +2394,7 @@ njs_vmcode_method_frame(njs_vm_t *vm, nj
 break;
 
 case NXT_ERROR:
-
-/* An exception was set in  njs_property_query(). */
-
+/* An exception was set in njs_property_query(). */
 return NXT_ERROR;
 
 default:
___
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel

[njs] Style fixes.

[Igor Sysoev]

details:   http://hg.nginx.org/njs/rev/e2baf506be4c
branches:  
changeset: 391:e2baf506be4c
user:  Igor Sysoev 
date:  Tue Aug 08 17:47:53 2017 +0300
description:
Style fixes.

diffstat:

 njs/njs_generator.c |  5 +
 njs/njs_variable.c  |  3 ---
 2 files changed, 1 insertions(+), 7 deletions(-)

diffs (59 lines):

diff -r c347ea0bbdd6 -r e2baf506be4c njs/njs_generator.c
--- a/njs/njs_generator.c   Tue Jul 18 19:25:50 2017 +0300
+++ b/njs/njs_generator.c   Tue Aug 08 17:47:53 2017 +0300
@@ -380,7 +380,7 @@ njs_generate_builtin_object(njs_vm_t *vm
 
 node->index = njs_generator_dest_index(vm, parser, node);
 if (nxt_slow_path(node->index == NJS_INDEX_ERROR)) {
-return node->index;
+return NXT_ERROR;
 }
 
 njs_generate_code(parser, njs_vmcode_object_copy_t, copy);
@@ -2541,13 +2541,11 @@ njs_generator_temp_index_get(njs_vm_t *v
 }
 
 if (vm->accumulative && scope->type == NJS_SCOPE_GLOBAL) {
-
 /*
  * When non-clonable VM runs in accumulative mode
  * all global variables are allocated in absolute scope
  * to simplify global scope handling.
  */
-
 value = nxt_mem_cache_align(vm->mem_cache_pool, sizeof(njs_value_t),
 sizeof(njs_value_t));
 if (nxt_slow_path(value == NULL)) {
@@ -2557,7 +2555,6 @@ njs_generator_temp_index_get(njs_vm_t *v
 index = (njs_index_t) value;
 
 } else {
-
 value = nxt_array_add(scope->values[0], _array_mem_proto,
   vm->mem_cache_pool);
 if (nxt_slow_path(value == NULL)) {
diff -r c347ea0bbdd6 -r e2baf506be4c njs/njs_variable.c
--- a/njs/njs_variable.cTue Jul 18 19:25:50 2017 +0300
+++ b/njs/njs_variable.cTue Aug 08 17:47:53 2017 +0300
@@ -356,13 +356,11 @@ njs_variable_get(njs_vm_t *vm, njs_parse
 }
 
 if (vm->accumulative && vs.scope->type == NJS_SCOPE_GLOBAL) {
-
 /*
  * When non-clonable VM runs in accumulative mode all
  * global variables should be allocated in absolute scope
  * to share them among consecutive VM invocations.
  */
-
 value = nxt_mem_cache_align(vm->mem_cache_pool, sizeof(njs_value_t),
 sizeof(njs_value_t));
 if (nxt_slow_path(value == NULL)) {
@@ -391,7 +389,6 @@ njs_variable_get(njs_vm_t *vm, njs_parse
 
 index = vs.scope->next_index[n];
 vs.scope->next_index[n] += sizeof(njs_value_t);
-
 }
 
 if (njs_is_object(>value)) {
___
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel

[njs] Style fixes and small miscellaneous changes.

[Igor Sysoev]

details:   http://hg.nginx.org/njs/rev/30cc8990272a
branches:  
changeset: 378:30cc8990272a
user:  Igor Sysoev 
date:  Tue Jun 27 11:17:54 2017 +0300
description:
Style fixes and small miscellaneous changes.

diffstat:

 nginx/ngx_http_js_module.c |   2 +-
 njs/njs_date.c |   4 ++--
 njs/njs_number.c   |  14 +++---
 njs/njs_object.c   |   4 ++--
 njs/njs_string.c   |  24 
 nxt/nxt_lvlhsh.c   |   4 ++--
 nxt/nxt_lvlhsh.h   |  12 ++--
 nxt/nxt_rbtree.c   |   1 -
 nxt/nxt_utf8.c |   2 +-
 9 files changed, 29 insertions(+), 38 deletions(-)

diffs (223 lines):

diff -r d882561d50e8 -r 30cc8990272a nginx/ngx_http_js_module.c
--- a/nginx/ngx_http_js_module.cFri Jun 23 15:49:09 2017 +0300
+++ b/nginx/ngx_http_js_module.cTue Jun 27 11:17:54 2017 +0300
@@ -139,7 +139,7 @@ static ngx_command_t  ngx_http_js_comman
 { ngx_string("js_set"),
   NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE2,
   ngx_http_js_set,
-  NGX_HTTP_LOC_CONF_OFFSET,
+  0,
   0,
   NULL },
 
diff -r d882561d50e8 -r 30cc8990272a njs/njs_date.c
--- a/njs/njs_date.cFri Jun 23 15:49:09 2017 +0300
+++ b/njs/njs_date.cTue Jun 27 11:17:54 2017 +0300
@@ -1052,8 +1052,8 @@ njs_date_prototype_to_iso_string(njs_vm_
 year = tm.tm_year + 1900;
 
 size = snprintf((char *) buf, NJS_ISO_DATE_TIME_LEN,
-(year < 0) ? "%07d-%02d-%02dT%02d:%02d:%02d.%03dZ":
- "%04d-%02d-%02dT%02d:%02d:%02d.%03dZ",
+(year < 0) ? "%07d-%02d-%02dT%02d:%02d:%02d.%03dZ"
+   : "%04d-%02d-%02dT%02d:%02d:%02d.%03dZ",
 year, tm.tm_mon + 1, tm.tm_mday,
 tm.tm_hour, tm.tm_min, tm.tm_sec,
 (int) ((int64_t) time % 1000));
diff -r d882561d50e8 -r 30cc8990272a njs/njs_number.c
--- a/njs/njs_number.c  Fri Jun 23 15:49:09 2017 +0300
+++ b/njs/njs_number.c  Tue Jun 27 11:17:54 2017 +0300
@@ -89,7 +89,7 @@ njs_number_dec_parse(u_char **start, u_c
 num = 0;
 
 while (p < end) {
-/* Values below '0' become >= 208. */
+/* Values less than '0' become >= 208. */
 c = *p - '0';
 
 if (nxt_slow_path(c > 9)) {
@@ -106,7 +106,7 @@ njs_number_dec_parse(u_char **start, u_c
 scale = 1;
 
 for (p++; p < end; p++) {
-/* Values below '0' become >= 208. */
+/* Values less than '0' become >= 208. */
 c = *p - '0';
 
 if (nxt_slow_path(c > 9)) {
@@ -135,7 +135,7 @@ njs_number_dec_parse(u_char **start, u_c
 }
 }
 
-/* Values below '0' become >= 208. */
+/* Values less than '0' become >= 208. */
 c = *e - '0';
 
 if (nxt_fast_path(c <= 9)) {
@@ -143,7 +143,7 @@ njs_number_dec_parse(u_char **start, u_c
 p = e + 1;
 
 while (p < end) {
-/* Values below '0' become >= 208. */
+/* Values less than '0' become >= 208. */
 c = *p - '0';
 
 if (nxt_slow_path(c > 9)) {
@@ -180,11 +180,11 @@ njs_number_hex_parse(u_char **start, u_c
 while (p < end) {
 c = (u_char) (*p | 0x20);
 
-/* Values below '0' become >= 208. */
+/* Values less than '0' become >= 208. */
 c = c - '0';
 
 if (c > 9) {
-/* Values below 'a' become >= 159. */
+/* Values less than 'a' become >= 159. */
 c = c - ('a' - '0');
 
 if (nxt_slow_path(c > 5)) {
@@ -800,7 +800,7 @@ njs_number_parse_int(njs_vm_t *vm, njs_v
 n = njs_number_radix_parse(, end, radix);
 
 if (n >= 0) {
-num = (minus) ? -n : n;
+num = minus ? -n : n;
 }
 }
 
diff -r d882561d50e8 -r 30cc8990272a njs/njs_object.c
--- a/njs/njs_object.c  Fri Jun 23 15:49:09 2017 +0300
+++ b/njs/njs_object.c  Tue Jun 27 11:17:54 2017 +0300
@@ -915,8 +915,8 @@ njs_object_is_extensible(njs_vm_t *vm, n
 return NXT_ERROR;
 }
 
-retval = args[1].data.u.object->extensible ? _string_true :
- _string_false;
+retval = args[1].data.u.object->extensible ? _string_true
+   : _string_false;
 
 vm->retval = *retval;
 
diff -r d882561d50e8 -r 30cc8990272a njs/njs_string.c
--- a/njs/njs_string.c  Fri Jun 23 15:49:09 2017 +0300
+++ b/njs/njs_string.c  Tue Jun 27 11:17:54 2017 +0300
@@ -2555,11 +2555,11 @@ static njs_ret_t
 njs_string_replace_search(njs_vm_t *vm, njs_value_t *args,
 njs_string_replace_t *r)
 {
-intcaptures[2];
-u_char *p, *end;
-size_t size;
-njs_ret_t  ret;
-nxt_str_t  search;
+intcaptures[2];
+u_char *p, *end;
+size_t size;
+njs_ret_t  ret;

[njs] Style fixes and small miscellaneous changes.

[Igor Sysoev]

details:   http://hg.nginx.org/njs/rev/7e6460db39ad
branches:  
changeset: 337:7e6460db39ad
user:  Igor Sysoev 
date:  Tue Apr 04 13:23:10 2017 +0300
description:
Style fixes and small miscellaneous changes.

diffstat:

 njs/njs_array.c|  2 +-
 njs/njs_function.c |  4 ++--
 njs/njs_parser.c   |  2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r f62632793238 -r 7e6460db39ad njs/njs_array.c
--- a/njs/njs_array.c   Tue Apr 04 11:00:49 2017 +0300
+++ b/njs/njs_array.c   Tue Apr 04 13:23:10 2017 +0300
@@ -2044,7 +2044,7 @@ njs_array_prototype_sort_continuation(nj
 sort->current++;
 n = sort->current;
 
-} while (sort->current < array->length);
+} while (n < array->length);
 }
 
 vm->retval = args[0];
diff -r f62632793238 -r 7e6460db39ad njs/njs_function.c
--- a/njs/njs_function.cTue Apr 04 11:00:49 2017 +0300
+++ b/njs/njs_function.cTue Apr 04 13:23:10 2017 +0300
@@ -162,7 +162,7 @@ njs_function_frame(njs_vm_t *vm, njs_fun
 nxt_bool_t ctor)
 {
 size_t size;
-nxt_uint_t n, max_args, closures;;
+nxt_uint_t n, max_args, closures;
 njs_value_t*value, *bound;
 njs_frame_t*frame;
 njs_native_frame_t *native_frame;
@@ -594,7 +594,7 @@ njs_function_activate(njs_vm_t *vm, njs_
 cont->retval = retval;
 
 cont->return_address = vm->current
-   + sizeof(njs_vmcode_function_call_t);;
+   + sizeof(njs_vmcode_function_call_t);
 vm->current = (u_char *) njs_continuation_nexus;
 
 return NJS_APPLIED;
diff -r f62632793238 -r 7e6460db39ad njs/njs_parser.c
--- a/njs/njs_parser.c  Tue Apr 04 11:00:49 2017 +0300
+++ b/njs/njs_parser.c  Tue Apr 04 13:23:10 2017 +0300
@@ -178,7 +178,7 @@ njs_parser_scope_begin(njs_vm_t *vm, njs
 if (type == NJS_SCOPE_FUNCTION) {
 scope->next_index[0] = type;
 scope->next_index[1] = NJS_SCOPE_CLOSURE + nesting
-   + sizeof(njs_value_t);;
+   + sizeof(njs_value_t);
 
 } else {
 if (type == NJS_SCOPE_GLOBAL) {
___
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel

[njs] Style fixes.

[Igor Sysoev]

details:   http://hg.nginx.org/njs/rev/dc8af19bf47d
branches:  
changeset: 326:dc8af19bf47d
user:  Andrey Zelenkov 
date:  Fri Mar 31 14:05:44 2017 +0300
description:
Style fixes.

diffstat:

 njs/njs_regexp.c |  2 +-
 njs/njs_string.c |  2 +-
 njs/njs_vm.c |  6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r 8e20f235b71e -r dc8af19bf47d njs/njs_regexp.c
--- a/njs/njs_regexp.c  Fri Mar 31 14:02:38 2017 +0300
+++ b/njs/njs_regexp.c  Fri Mar 31 14:05:44 2017 +0300
@@ -565,7 +565,7 @@ njs_regexp_prototype_to_string(njs_vm_t 
 
 value = [0];
 
-if (value->type == NJS_REGEXP) {
+if (njs_is_regexp(value)) {
 pattern = value->data.u.regexp->pattern;
 source = pattern->source;
 
diff -r 8e20f235b71e -r dc8af19bf47d njs/njs_string.c
--- a/njs/njs_string.c  Fri Mar 31 14:02:38 2017 +0300
+++ b/njs/njs_string.c  Fri Mar 31 14:05:44 2017 +0300
@@ -3573,7 +3573,7 @@ njs_values_hash_test(nxt_lvlhsh_query_t 
 return NXT_OK;
 }
 
-if (value->type == NJS_STRING
+if (njs_is_string(value)
 && value->data.string_size == lhq->key.length
 && memcmp(value->data.u.string->start, lhq->key.start, lhq->key.length)
== 0)
diff -r 8e20f235b71e -r dc8af19bf47d njs/njs_vm.c
--- a/njs/njs_vm.c  Fri Mar 31 14:02:38 2017 +0300
+++ b/njs/njs_vm.c  Fri Mar 31 14:05:44 2017 +0300
@@ -292,7 +292,7 @@ njs_value_retain(njs_value_t *value)
 {
 njs_string_t  *string;
 
-if (value->type == NJS_STRING) {
+if (njs_is_string(value)) {
 
 if (value->data.external0 != 0xff) {
 string = value->data.u.string;
@@ -313,7 +313,7 @@ njs_value_release(njs_vm_t *vm, njs_valu
 {
 njs_string_t  *string;
 
-if (value->type == NJS_STRING) {
+if (njs_is_string(value)) {
 
 if (value->data.external0 != 0xff) {
 string = value->data.u.string;
@@ -2071,7 +2071,7 @@ njs_values_strict_equal(const njs_value_
 
 if (njs_is_numeric(val1)) {
 
-if (val1->type == NJS_VOID) {
+if (njs_is_void(val1)) {
 return 1;
 }
 
___
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel

[njs] Style fixes.

[Igor Sysoev]

details:   http://hg.nginx.org/njs/rev/6fc0e6b7f797
branches:  
changeset: 203:6fc0e6b7f797
user:  Igor Sysoev 
date:  Mon Oct 17 17:03:22 2016 +0300
description:
Style fixes.

diffstat:

 njs/njs_array.c  |   2 ++
 njs/njs_string.c |  38 +++---
 2 files changed, 21 insertions(+), 19 deletions(-)

diffs (80 lines):

diff -r 938d49b0f420 -r 6fc0e6b7f797 njs/njs_array.c
--- a/njs/njs_array.c   Mon Oct 17 16:42:31 2016 +0300
+++ b/njs/njs_array.c   Mon Oct 17 17:03:22 2016 +0300
@@ -759,6 +759,7 @@ njs_array_prototype_join(njs_vm_t *vm, n
 
 for (i = 0; i < array->length; i++) {
 value = >start[i];
+
 if (!njs_is_string(value)
 && njs_is_valid(value)
 && !njs_is_null_or_void(value))
@@ -783,6 +784,7 @@ njs_array_prototype_join(njs_vm_t *vm, n
 
 for (i = 0; i < array->length; i++) {
 value = >start[i];
+
 if (!njs_is_string(value)
 && njs_is_valid(value)
 && !njs_is_null_or_void(value))
diff -r 938d49b0f420 -r 6fc0e6b7f797 njs/njs_string.c
--- a/njs/njs_string.c  Mon Oct 17 16:42:31 2016 +0300
+++ b/njs/njs_string.c  Mon Oct 17 17:03:22 2016 +0300
@@ -1018,7 +1018,7 @@ static nxt_noinline void
 njs_string_slice_args(njs_slice_prop_t *slice, njs_value_t *args,
 nxt_uint_t nargs)
 {
-ssize_tstart, end, length;
+ssize_t  start, end, length;
 
 length = slice->string_length;
 start = 0;
@@ -1079,30 +1079,30 @@ njs_string_slice(njs_vm_t *vm, njs_value
 start = string->start;
 
 if (string->size == slice->string_length) {
-   /* Byte or ASCII string. */
-   start += slice->start;
-   size = slice->length;
+/* Byte or ASCII string. */
+start += slice->start;
+size = slice->length;
 
 } else {
-   /* UTF-8 string. */
+/* UTF-8 string. */
 end = start + string->size;
-   start = njs_string_offset(start, end, slice->start);
-
-   /* Evaluate size of the slice in bytes and ajdust length. */
-   p = start;
-   n = length;
-
-   do {
-   p = nxt_utf8_next(p, end);
-   n--;
-   } while (n != 0 && p < end);
-
-   size = p - start;
-   length -= n;
+start = njs_string_offset(start, end, slice->start);
+
+/* Evaluate size of the slice in bytes and ajdust length. */
+p = start;
+n = length;
+
+do {
+p = nxt_utf8_next(p, end);
+n--;
+} while (n != 0 && p < end);
+
+size = p - start;
+length -= n;
 }
 
 if (nxt_fast_path(size != 0)) {
-   return njs_string_new(vm, >retval, start, size, length);
+return njs_string_new(vm, >retval, start, size, length);
 }
 
 vm->retval = njs_string_empty;

___
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel

[njs] Style fixes.

[Igor Sysoev]

details:   http://hg.nginx.org/njs/rev/dcd8a105b5e7
branches:  
changeset: 156:dcd8a105b5e7
user:  Igor Sysoev 
date:  Tue Aug 16 18:09:35 2016 +0300
description:
Style fixes.

diffstat:

 njs/njs_array.c  |  84 +++
 njs/njs_string.c |  20 ++
 njs/njs_vm.h |   2 +-
 nxt/nxt_djb_hash.h   |   2 +-
 nxt/nxt_lvlhsh.c |  46 +-
 nxt/nxt_lvlhsh.h |  36 ++--
 nxt/nxt_mem_cache_pool.c |   6 +-
 nxt/nxt_rbtree.c |   2 +-
 nxt/nxt_rbtree.h |   4 +-
 9 files changed, 102 insertions(+), 100 deletions(-)

diffs (606 lines):

diff -r e6e192a55774 -r dcd8a105b5e7 njs/njs_array.c
--- a/njs/njs_array.c   Mon Aug 15 11:33:37 2016 +0300
+++ b/njs/njs_array.c   Tue Aug 16 18:09:35 2016 +0300
@@ -79,28 +79,26 @@ typedef struct {
 } njs_array_sort_t;
 
 
-static njs_ret_t
-njs_array_prototype_to_string_continuation(njs_vm_t *vm, njs_value_t *args,
-nxt_uint_t nargs, njs_index_t retval);
+static njs_ret_t njs_array_prototype_to_string_continuation(njs_vm_t *vm,
+njs_value_t *args, nxt_uint_t nargs, njs_index_t retval);
 static njs_ret_t njs_array_prototype_join_continuation(njs_vm_t *vm,
 njs_value_t *args, nxt_uint_t nargs, njs_index_t unused);
-static nxt_noinline njs_value_t *njs_array_copy(njs_value_t *dst,
-njs_value_t *src);
+static njs_value_t *njs_array_copy(njs_value_t *dst, njs_value_t *src);
 static njs_ret_t njs_array_index_of(njs_vm_t *vm, njs_value_t *args,
 nxt_uint_t nargs, nxt_bool_t first);
-static nxt_noinline njs_ret_t njs_array_prototype_for_each_cont(njs_vm_t *vm,
-njs_value_t *args, nxt_uint_t nargs, njs_index_t unused);
-static nxt_noinline njs_ret_t njs_array_prototype_some_cont(njs_vm_t *vm,
-njs_value_t *args, nxt_uint_t nargs, njs_index_t unused);
-static nxt_noinline njs_ret_t njs_array_prototype_every_cont(njs_vm_t *vm,
+static njs_ret_t njs_array_prototype_for_each_continuation(njs_vm_t *vm,
 njs_value_t *args, nxt_uint_t nargs, njs_index_t unused);
-static njs_ret_t njs_array_prototype_filter_cont(njs_vm_t *vm,
+static njs_ret_t njs_array_prototype_some_continuation(njs_vm_t *vm,
 njs_value_t *args, nxt_uint_t nargs, njs_index_t unused);
-static njs_ret_t njs_array_prototype_map_cont(njs_vm_t *vm, njs_value_t *args,
-nxt_uint_t nargs, njs_index_t unused);
-static njs_ret_t njs_array_prototype_reduce_cont(njs_vm_t *vm,
+static njs_ret_t njs_array_prototype_every_continuation(njs_vm_t *vm,
 njs_value_t *args, nxt_uint_t nargs, njs_index_t unused);
-static njs_ret_t njs_array_prototype_reduce_right_cont(njs_vm_t *vm,
+static njs_ret_t njs_array_prototype_filter_continuation(njs_vm_t *vm,
+njs_value_t *args, nxt_uint_t nargs, njs_index_t unused);
+static njs_ret_t njs_array_prototype_map_continuation(njs_vm_t *vm,
+njs_value_t *args, nxt_uint_t nargs, njs_index_t unused);
+static njs_ret_t njs_array_prototype_reduce_continuation(njs_vm_t *vm,
+njs_value_t *args, nxt_uint_t nargs, njs_index_t unused);
+static njs_ret_t njs_array_prototype_reduce_right_continuation(njs_vm_t *vm,
 njs_value_t *args, nxt_uint_t nargs, njs_index_t unused);
 static nxt_noinline njs_ret_t njs_array_iterator_args(njs_vm_t *vm,
 njs_value_t *args, nxt_uint_t nargs);
@@ -109,8 +107,8 @@ static nxt_noinline uint32_t njs_array_i
 static nxt_noinline njs_ret_t njs_array_iterator_apply(njs_vm_t *vm,
 njs_array_iter_t *iter, njs_value_t *args, nxt_uint_t nargs);
 static uint32_t njs_array_reduce_right_next(njs_array_t *array, int32_t n);
-static njs_ret_t njs_array_prototype_sort_cont(njs_vm_t *vm, njs_value_t *args,
-nxt_uint_t nargs, njs_index_t unused);
+static njs_ret_t njs_array_prototype_sort_continuation(njs_vm_t *vm,
+njs_value_t *args, nxt_uint_t nargs, njs_index_t unused);
 
 
 nxt_noinline njs_array_t *
@@ -932,7 +930,7 @@ njs_array_prototype_concat(njs_vm_t *vm,
 }
 
 
-static nxt_noinline njs_value_t *
+static njs_value_t *
 njs_array_copy(njs_value_t *dst, njs_value_t *src)
 {
 nxt_uint_t  n;
@@ -1031,14 +1029,14 @@ njs_array_prototype_for_each(njs_vm_t *v
 }
 
 iter = njs_continuation(vm->frame);
-iter->u.cont.function = njs_array_prototype_for_each_cont;
+iter->u.cont.function = njs_array_prototype_for_each_continuation;
 
-return njs_array_prototype_for_each_cont(vm, args, nargs, unused);
+return njs_array_prototype_for_each_continuation(vm, args, nargs, unused);
 }
 
 
 static njs_ret_t
-njs_array_prototype_for_each_cont(njs_vm_t *vm, njs_value_t *args,
+njs_array_prototype_for_each_continuation(njs_vm_t *vm, njs_value_t *args,
 nxt_uint_t nargs, njs_index_t unused)
 {
 njs_array_iter_t  *iter;
@@ -1067,15 +1065,15 @@ njs_array_prototype_some(njs_vm_t *vm, n
 }
 
 iter = njs_continuation(vm->frame);
-iter->u.cont.function = njs_array_prototype_some_cont;
+iter->u.cont.function =