From 9ee535ce9d521462fd6f72e577a9c62638bf62e0 Mon Sep 17 00:00:00 2001 From: Andrey Zelenkov Date: Fri, 31 Mar 2017 14:05:44 +0300 Subject: [PATCH] Style fixes. --- njs/njs_regexp.c | 2 +- njs/njs_string.c | 2 +- njs/njs_vm.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/njs/njs_regexp.c b/njs/njs_regexp.c index 74e9ab1c..10e65848 100644 --- a/njs/njs_regexp.c +++ b/njs/njs_regexp.c @@ -565,7 +565,7 @@ njs_regexp_prototype_to_string(njs_vm_t *vm, njs_value_t *args, value = &args[0]; - if (value->type == NJS_REGEXP) { + if (njs_is_regexp(value)) { pattern = value->data.u.regexp->pattern; source = pattern->source; diff --git a/njs/njs_string.c b/njs/njs_string.c index d78c7923..9e539940 100644 --- a/njs/njs_string.c +++ b/njs/njs_string.c @@ -3573,7 +3573,7 @@ njs_values_hash_test(nxt_lvlhsh_query_t *lhq, void *data) 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 --git a/njs/njs_vm.c b/njs/njs_vm.c index 9e9f357a..d4801070 100644 --- a/njs/njs_vm.c +++ b/njs/njs_vm.c @@ -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_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; @@ -2071,7 +2071,7 @@ njs_values_strict_equal(const njs_value_t *val1, const njs_value_t *val2) if (njs_is_numeric(val1)) { - if (val1->type == NJS_VOID) { + if (njs_is_void(val1)) { return 1; } -- 2.47.3