From 7ff7dc40875a3a7d95cda55359bf7e4e2f229ee3 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 17 Oct 2016 17:03:22 +0300 Subject: [PATCH] Style fixes. --- njs/njs_array.c | 2 ++ njs/njs_string.c | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/njs/njs_array.c b/njs/njs_array.c index da040125..3b8fe885 100644 --- a/njs/njs_array.c +++ b/njs/njs_array.c @@ -759,6 +759,7 @@ njs_array_prototype_join(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs, for (i = 0; i < array->length; i++) { value = &array->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, njs_value_t *args, nxt_uint_t nargs, for (i = 0; i < array->length; i++) { value = &array->start[i]; + if (!njs_is_string(value) && njs_is_valid(value) && !njs_is_null_or_void(value)) diff --git a/njs/njs_string.c b/njs/njs_string.c index cd449aea..0803c006 100644 --- a/njs/njs_string.c +++ b/njs/njs_string.c @@ -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_t start, 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_t *dst, 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); + start = njs_string_offset(start, end, slice->start); - /* Evaluate size of the slice in bytes and ajdust length. */ - p = start; - n = length; + /* 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); + do { + p = nxt_utf8_next(p, end); + n--; + } while (n != 0 && p < end); - size = p - start; - length -= n; + size = p - start; + length -= n; } if (nxt_fast_path(size != 0)) { - return njs_string_new(vm, &vm->retval, start, size, length); + return njs_string_new(vm, &vm->retval, start, size, length); } vm->retval = njs_string_empty; -- 2.47.3