From: Dmitry Volyntsev Date: Thu, 29 Sep 2022 07:35:34 +0000 (-0700) Subject: Style. X-Git-Tag: 0.7.8~14 X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=a03b737ece595f44707ae0370877d027dd78fe1a;p=njs.git Style. --- diff --git a/src/njs_array.c b/src/njs_array.c index c72a4630..6491c1da 100644 --- a/src/njs_array.c +++ b/src/njs_array.c @@ -173,7 +173,8 @@ njs_array_convert_to_slow_array(njs_vm_t *vm, njs_array_t *array) njs_int_t -njs_array_length_redefine(njs_vm_t *vm, njs_value_t *value, uint32_t length, int writable) +njs_array_length_redefine(njs_vm_t *vm, njs_value_t *value, uint32_t length, + int writable) { njs_object_prop_t *prop; @@ -1631,14 +1632,18 @@ njs_array_indices_handler(const void *first, const void *second, void *ctx) njs_string_get(val1, &str1); njs_string_get(val2, &str2); - cmp_res = strncmp((const char *) str1.start, (const char *) str2.start, - njs_min(str1.length, str2.length)); + cmp_res = strncmp((const char *) str1.start, (const char *) str2.start, + njs_min(str1.length, str2.length)); + if (cmp_res == 0) { if (str1.length < str2.length) { return -1; + } else if (str1.length > str2.length) { return 1; + } else { + return 0; } } diff --git a/src/njs_object_prop.c b/src/njs_object_prop.c index fb1db019..fadc9444 100644 --- a/src/njs_object_prop.c +++ b/src/njs_object_prop.c @@ -467,9 +467,11 @@ done: if (prev->configurable != 1 && prev->writable != 1 && - !njs_values_strict_equal(&prev->value, &prop->value)) + !njs_values_strict_equal(&prev->value, + &prop->value)) { - njs_type_error(vm, "Cannot redefine property: \"length\""); + njs_type_error(vm, "Cannot redefine " + "property: \"length\""); return NJS_ERROR; } @@ -477,7 +479,8 @@ done: prev->writable = prop->writable; } - return njs_array_length_set(vm, object, prev, &prop->value); + return njs_array_length_set(vm, object, prev, + &prop->value); } } }