Use njs_string_get() where appropriate.

diff --git a/njs/njs_date.c b/njs/njs_date.c
index 4136d1b4517fcb0596a2a8fc4cf76a493dec72bd..73c1a21778d023e1560375667254f1fdfeee7b21 100644 (file)
--- a/njs/njs_date.c
+++ b/njs/njs_date.c
@@ -306,15 +306,15 @@ njs_date_string_parse(njs_value_t *date)
 {
     int                ext, ms, ms_length, skipped;
     double             time;
+    nxt_str_t          string;
     struct tm          tm;
     nxt_bool_t         sign, week, utc;
     const u_char       *p, *next, *end;
-    njs_string_prop_t  string;
 
-    (void) njs_string_prop(&string, date);
+    njs_string_get(date, &string);
 
     p = string.start;
-    end = p + string.size;
+    end = p + string.length;
 
     if (nxt_slow_path(p >= end)) {
         return NAN;

diff --git a/njs/njs_number.c b/njs/njs_number.c
index 039c9c58741b4dcc79133dcdd7d9471afd768028..aaf539dcc5d252fd15055c6ddf7b4b8f2fb27785 100644 (file)
--- a/njs/njs_number.c
+++ b/njs/njs_number.c
@@ -741,15 +741,15 @@ njs_number_parse_int(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
     u_char             *p, *end;
     int64_t            n;
     uint8_t            radix;
+    nxt_str_t          string;
     nxt_bool_t         minus, test_prefix;
-    njs_string_prop_t  string;
 
     num = NAN;
 
     if (nargs > 1) {
-        (void) njs_string_prop(&string, &args[1]);
+        njs_string_get(&args[1], &string);
 
-        end = string.start + string.size;
+        end = string.start + string.length;
 
         for (p = string.start; p < end; p++) {
             if (*p != ' ') {

diff --git a/njs/njs_object.c b/njs/njs_object.c
index e83255eaecb323f9f75fbd148a72dd910ab8289f..1f65e7305027673ca878f03b6ae8946af7e11c3c 100644 (file)
--- a/njs/njs_object.c
+++ b/njs/njs_object.c
@@ -417,8 +417,6 @@ njs_object_define_property(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
     njs_index_t unused)
 {
     nxt_int_t           ret;
-    nxt_str_t           key;
-    njs_value_t         *name;
     njs_object_t        *object, *descriptor;
     njs_object_prop_t   *prop, *pr;
     nxt_lvlhsh_query_t  lhq, pq;
@@ -429,26 +427,16 @@ njs_object_define_property(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
     }
 
     object = args[1].data.u.object;
-    name = &args[2];
     descriptor = args[3].data.u.object;
 
-    if (name->short_string.size != NJS_STRING_LONG) {
-        key.start = name->short_string.start;
-        key.length = name->short_string.length;
-
-    } else {
-        key.start = name->data.u.string->start;
-        key.length = name->data.string_size;
-    }
-
-    lhq.key = key;
-    lhq.key_hash = nxt_djb_hash(key.start, key.length);
+    njs_string_get(&args[2], &lhq.key);
+    lhq.key_hash = nxt_djb_hash(lhq.key.start, lhq.key.length);
     lhq.proto = &njs_object_hash_proto;
 
     ret = nxt_lvlhsh_find(&object->hash, &lhq);
 
     if (ret != NXT_OK) {
-        prop = njs_object_prop_alloc(vm, name);
+        prop = njs_object_prop_alloc(vm, &args[2]);
 
         if (nxt_slow_path(prop == NULL)) {
             return NXT_ERROR;

diff --git a/njs/njs_regexp.c b/njs/njs_regexp.c
index 10e65848de34d6226ac34e360b5a9641778aaa1a..e0ad1cbd9ee93b023874693fbdb0d814269e19c2 100644 (file)
--- a/njs/njs_regexp.c
+++ b/njs/njs_regexp.c
@@ -87,7 +87,7 @@ njs_ret_t
 njs_regexp_constructor(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
     njs_index_t unused)
 {
-    njs_string_prop_t   string;
+    nxt_str_t           string;
     njs_regexp_flags_t  flags;
 
     flags = 0;
@@ -96,13 +96,14 @@ njs_regexp_constructor(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
 
     case 1:
         string.start = NULL;
-        string.size = 0;
+        string.length = 0;
         break;
 
     default:
-        (void) njs_string_prop(&string, &args[2]);
+        njs_string_get(&args[2], &string);
 
-        flags = njs_regexp_flags(&string.start, string.start + string.size, 1);
+        flags = njs_regexp_flags(&string.start, string.start + string.length,
+                                 1);
         if (nxt_slow_path(flags < 0)) {
             return NXT_ERROR;
         }
@@ -110,11 +111,12 @@ njs_regexp_constructor(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
         /* Fall through. */
 
     case 2:
-        (void) njs_string_prop(&string, &args[1]);
+        njs_string_get(&args[1], &string);
         break;
     }
 
-    return njs_regexp_create(vm, &vm->retval, string.start, string.size, flags);
+    return njs_regexp_create(vm, &vm->retval, string.start, string.length,
+                             flags);
 }
 
 

diff --git a/njs/njs_string.c b/njs/njs_string.c
index 70f62fbe3c23e6562b6800c1a1a0065d8344f5e3..85378194102624814093108bcbcb5cebda7ff1b0 100644 (file)
--- a/njs/njs_string.c
+++ b/njs/njs_string.c
@@ -1940,15 +1940,15 @@ static njs_ret_t
 njs_string_prototype_match(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
     njs_index_t unused)
 {
+    nxt_str_t             string;
     njs_ret_t             ret;
     njs_value_t           arguments[2];
-    njs_string_prop_t     string;
     njs_regexp_pattern_t  *pattern;
 
     arguments[1] = args[0];
 
     string.start = NULL;
-    string.size = 0;
+    string.length = 0;
 
     if (nargs > 1) {
 
@@ -1970,13 +1970,13 @@ njs_string_prototype_match(njs_vm_t *vm, njs_value_t *args, nxt_uint_t nargs,
 
         if (njs_is_string(&args[1])) {
             /* string1.match(string2) is the same as /string2/.exec(string1). */
-            (void) njs_string_prop(&string, &args[1]);
+            njs_string_get(&args[1], &string);
         }
 
         /* A void value. */
     }
 
-    ret = njs_regexp_create(vm, &arguments[0], string.start, string.size, 0);
+    ret = njs_regexp_create(vm, &arguments[0], string.start, string.length, 0);
     if (nxt_slow_path(ret != NXT_OK)) {
         return ret;
     }
@@ -2559,19 +2559,19 @@ njs_string_replace_search(njs_vm_t *vm, njs_value_t *args,
     u_char             *p, *end;
     size_t             size;
     njs_ret_t          ret;
-    njs_string_prop_t  search;
+    nxt_str_t          search;
 
-    (void) njs_string_prop(&search, &args[1]);
+    njs_string_get(&args[1], &search);
 
     p = r->part[0].start;
-    end = (p + r->part[0].size) - (search.size - 1);
+    end = (p + r->part[0].size) - (search.length - 1);
 
     do {
-        if (memcmp(p, search.start, search.size) == 0) {
+        if (memcmp(p, search.start, search.length) == 0) {
 
             if (r->substitutions != NULL) {
                 captures[0] = p - r->part[0].start;
-                captures[1] = captures[0] + search.size;
+                captures[1] = captures[0] + search.length;
 
                 ret = njs_string_replace_substitute(vm, r, captures);
                 if (nxt_slow_path(ret != NXT_OK)) {
@@ -2579,9 +2579,9 @@ njs_string_replace_search(njs_vm_t *vm, njs_value_t *args,
                 }
 
             } else {
-                r->part[2].start = p + search.size;
+                r->part[2].start = p + search.length;
                 size = p - r->part[0].start;
-                r->part[2].size = r->part[0].size - size - search.size;
+                r->part[2].size = r->part[0].size - size - search.length;
                 r->part[0].size = size;
                 njs_set_invalid(&r->part[2].value);
 
@@ -3344,17 +3344,17 @@ njs_string_encode(njs_vm_t *vm, njs_value_t *value, const uint32_t *escape)
 {
     u_char               byte, *src, *dst;
     size_t               n, size;
-    njs_string_prop_t    string;
+    nxt_str_t            string;
     static const u_char  hex[16] = "0123456789ABCDEF";
 
     nxt_prefetch(escape);
 
-    (void) njs_string_prop(&string, value);
+    njs_string_get(value, &string);
 
     src = string.start;
     n = 0;
 
-    for (size = string.size; size != 0; size--) {
+    for (size = string.length; size != 0; size--) {
         byte = *src++;
 
         if ((escape[byte >> 5] & ((uint32_t) 1 << (byte & 0x1f))) != 0) {
@@ -3368,14 +3368,14 @@ njs_string_encode(njs_vm_t *vm, njs_value_t *value, const uint32_t *escape)
         return NXT_OK;
     }
 
-    size = string.size + n;
+    size = string.length + n;
 
     dst = njs_string_alloc(vm, &vm->retval, size, size);
     if (nxt_slow_path(dst == NULL)) {
         return NXT_ERROR;
     }
 
-    size = string.size;
+    size = string.length;
     src = string.start;
 
     do {
@@ -3477,8 +3477,8 @@ njs_string_decode(njs_vm_t *vm, njs_value_t *value, const uint32_t *reserve)
     u_char               byte, *start, *src, *dst;
     size_t               n;
     ssize_t              size, length;
+    nxt_str_t            string;
     nxt_bool_t           utf8;
-    njs_string_prop_t    string;
 
     static const int8_t  hex[256]
         nxt_aligned(32) =
@@ -3504,12 +3504,12 @@ njs_string_decode(njs_vm_t *vm, njs_value_t *value, const uint32_t *reserve)
     nxt_prefetch(&hex['0']);
     nxt_prefetch(reserve);
 
-    (void) njs_string_prop(&string, value);
+    njs_string_get(value, &string);
 
     src = string.start;
     n = 0;
 
-    for (size = string.size; size != 0; size--) {
+    for (size = string.length; size != 0; size--) {
         byte = *src++;
 
         if (byte == '%') {
@@ -3543,7 +3543,7 @@ njs_string_decode(njs_vm_t *vm, njs_value_t *value, const uint32_t *reserve)
         return NXT_OK;
     }
 
-    n = string.size - n;
+    n = string.length - n;
 
     start = njs_string_alloc(vm, &vm->retval, n, n);
     if (nxt_slow_path(start == NULL)) {
@@ -3552,7 +3552,7 @@ njs_string_decode(njs_vm_t *vm, njs_value_t *value, const uint32_t *reserve)
 
     utf8 = 0;
     dst = start;
-    size = string.size;
+    size = string.length;
     src = string.start;
 
     do {