Style fixes.

diff --git a/njs/njs_regexp.c b/njs/njs_regexp.c
index 74e9ab1cfcf05cb61826438ae3f6efe9053693d8..10e65848de34d6226ac34e360b5a9641778aaa1a 100644 (file)
--- 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 d78c79239fbb9b007ce57a17125c1392c4053300..9e539940689b1090c46ce44a39b93aeaa061611a 100644 (file)
--- 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 9e9f357aa345aad768d6b8d8fde7e1835ffd6182..d4801070ac2f4c2818f103b185f0605da64e6554 100644 (file)
--- 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;
         }