njs_string_new().

diff --git a/njs/njs_date.c b/njs/njs_date.c
index 29489e165317cd4467b4f3e3d72baf5db008c6df..ea15a86dac28239cb72c4270bd7ef6e8b79fdbb3 100644 (file)
--- a/njs/njs_date.c
+++ b/njs/njs_date.c
@@ -831,7 +831,6 @@ njs_date_string(njs_vm_t *vm, const char *fmt, double time)
 {
     size_t     size;
     time_t     clock;
-    u_char     *start;
     u_char     buf[NJS_DATE_TIME_LEN];
     struct tm  tm;
 
@@ -841,14 +840,7 @@ njs_date_string(njs_vm_t *vm, const char *fmt, double time)
 
         size = strftime((char *) buf, NJS_DATE_TIME_LEN, fmt, &tm);
 
-        start = njs_string_alloc(vm, &vm->retval, size, size);
-
-        if (nxt_fast_path(start != NULL)) {
-            memcpy(start, buf, size);
-            return NXT_OK;
-        }
-
-        return NXT_ERROR;
+        return njs_string_new(vm, &vm->retval, buf, size, size);
     }
 
     vm->retval = njs_string_invalid_date;
@@ -864,7 +856,6 @@ njs_date_prototype_to_utc_string(njs_vm_t *vm, njs_value_t *args,
     double             time;
     size_t             size;
     time_t             clock;
-    u_char             *start;
     u_char             buf[NJS_DATE_TIME_LEN];
     struct tm          tm;
 
@@ -886,14 +877,7 @@ njs_date_prototype_to_utc_string(njs_vm_t *vm, njs_value_t *args,
                         tm.tm_mday, tm.tm_year + 1900,
                         tm.tm_hour, tm.tm_min, tm.tm_sec);
 
-        start = njs_string_alloc(vm, &vm->retval, size, size);
-
-        if (nxt_fast_path(start != NULL)) {
-            memcpy(start, buf, size);
-            return NXT_OK;
-        }
-
-        return NXT_ERROR;
+        return njs_string_new(vm, &vm->retval, buf, size, size);
     }
 
     vm->retval = njs_string_invalid_date;
@@ -910,7 +894,6 @@ njs_date_prototype_to_iso_string(njs_vm_t *vm, njs_value_t *args,
     double     time;
     size_t     size;
     time_t     clock;
-    u_char     *start;
     u_char     buf[NJS_ISO_DATE_TIME_LEN];
     struct tm  tm;
 
@@ -930,14 +913,7 @@ njs_date_prototype_to_iso_string(njs_vm_t *vm, njs_value_t *args,
                         tm.tm_hour, tm.tm_min, tm.tm_sec,
                         (int) ((int64_t) time % 1000));
 
-        start = njs_string_alloc(vm, &vm->retval, size, size);
-
-        if (nxt_fast_path(start != NULL)) {
-            memcpy(start, buf, size);
-            return NXT_OK;
-        }
-
-        return NXT_ERROR;
+        return njs_string_new(vm, &vm->retval, buf, size, size);
     }
 
     vm->exception = &njs_exception_range_error;

diff --git a/njs/njs_number.c b/njs/njs_number.c
index 8c0bf79a85c383d530a0890fcbf59fe97bfefcad..041ffd99b2f967746f792d75df3a607e8ad51074 100644 (file)
--- a/njs/njs_number.c
+++ b/njs/njs_number.c
@@ -167,12 +167,11 @@ njs_ret_t
 njs_number_to_string(njs_vm_t *vm, njs_value_t *string,
     const njs_value_t *number)
 {
-    u_char             *p;
     double             n, num;
     size_t             size;
     const char         *fmt;
     const njs_value_t  *value;
-    char               buf[128];
+    u_char             buf[128];
 
     num = number->data.u.number;
 
@@ -207,16 +206,9 @@ njs_number_to_string(njs_vm_t *vm, njs_value_t *string,
             fmt = "%1.e";
         }
 
-        size = snprintf(buf, sizeof(buf), fmt, num);
+        size = snprintf((char *) buf, sizeof(buf), fmt, num);
 
-        p = njs_string_alloc(vm, string, size, size);
-
-        if (nxt_fast_path(p != NULL)) {
-            memcpy(p, buf, size);
-            return NXT_OK;
-        }
-
-        return NXT_ERROR;
+        return njs_string_new(vm, string, buf, size, size);
     }
 
     *string = *value;
@@ -363,7 +355,7 @@ static njs_ret_t
 njs_number_to_string_radix(njs_vm_t *vm, njs_value_t *string,
     const njs_value_t *number, uint32_t radix)
 {
-    u_char   *p, *f, *start, *end;
+    u_char   *p, *f, *end;
     double   n, next;
     size_t   size;
     uint8_t  reminder;
@@ -410,14 +402,7 @@ njs_number_to_string_radix(njs_vm_t *vm, njs_value_t *string,
 
     size = f - p;
 
-    start = njs_string_alloc(vm, string, size, size);
-
-    if (nxt_fast_path(start != NULL)) {
-        memcpy(start, p, size);
-        return NXT_OK;
-    }
-
-    return NXT_ERROR;
+    return njs_string_new(vm, string, p, size, size);
 }
 
 

diff --git a/njs/njs_string.c b/njs/njs_string.c
index 5a6946408b1cdaec0ced8b120aaed0a4a35e1a6c..521af90b01c55c13f084c868965eac1e47778b54 100644 (file)
--- a/njs/njs_string.c
+++ b/njs/njs_string.c
@@ -92,6 +92,28 @@ njs_string_create(njs_vm_t *vm, njs_value_t *value, u_char *start, size_t size,
 }
 
 
+nxt_noinline njs_ret_t
+njs_string_new(njs_vm_t *vm, njs_value_t *value, const u_char *start,
+    uint32_t size, uint32_t length)
+{
+    u_char  *p;
+
+    p = njs_string_alloc(vm, value, size, length);
+
+    if (nxt_fast_path(p != NULL)) {
+        memcpy(p, start, size);
+
+        if (size != length && length >= NJS_STRING_MAP_OFFSET) {
+            njs_string_offset_map_init(p, size);
+        }
+
+        return NXT_OK;
+    }
+
+    return NXT_ERROR;
+}
+
+
 nxt_noinline u_char *
 njs_string_alloc(njs_vm_t *vm, njs_value_t *value, uint32_t size,
     uint32_t length)
@@ -571,7 +593,6 @@ static njs_ret_t
 njs_string_prototype_from_utf8(njs_vm_t *vm, njs_value_t *args,
     nxt_uint_t nargs, njs_index_t unused)
 {
-    u_char             *p;
     ssize_t            length;
     njs_slice_prop_t   slice;
     njs_string_prop_t  string;
@@ -596,17 +617,8 @@ njs_string_prototype_from_utf8(njs_vm_t *vm, njs_value_t *args,
         }
 
         /* Long UTF-8 string. */
-
-        p = njs_string_alloc(vm, &vm->retval, slice.length, length);
-
-        if (nxt_fast_path(p != NULL)) {
-            memcpy(p, string.start, slice.length);
-            njs_string_offset_map_init(p, slice.length);
-
-            return NXT_OK;
-        }
-
-        return NXT_ERROR;
+        return njs_string_new(vm, &vm->retval, string.start, slice.length,
+                              length);
     }
 
     vm->retval = njs_value_null;
@@ -949,7 +961,6 @@ nxt_noinline njs_ret_t
 njs_string_slice(njs_vm_t *vm, njs_value_t *dst,
     const njs_string_prop_t *string, njs_slice_prop_t *slice)
 {
-    u_char        *s;
     size_t        size, n, length;
     ssize_t       excess;
     const u_char  *p, *start, *end;
@@ -994,19 +1005,7 @@ njs_string_slice(njs_vm_t *vm, njs_value_t *dst,
         }
 
         if (nxt_fast_path(size != 0)) {
-            s = njs_string_alloc(vm, &vm->retval, size, length);
-
-            if (nxt_slow_path(s == NULL)) {
-                return NXT_ERROR;
-            }
-
-            memcpy(s, start, size);
-
-            if (length >= NJS_STRING_MAP_OFFSET && size != length) {
-                njs_string_offset_map_init(s, size);
-            }
-
-            return NXT_OK;
+            return njs_string_new(vm, &vm->retval, start, size, length);
         }
     }
 

diff --git a/njs/njs_string.h b/njs/njs_string.h
index 5e9f188f29fd84be87c5facaad66d59b103e35ef..d4d398a2be1c7f3223797f948d1dce04c25150b6 100644 (file)
--- a/njs/njs_string.h
+++ b/njs/njs_string.h
@@ -80,6 +80,8 @@ typedef struct {
 } njs_slice_prop_t;
 
 
+njs_ret_t njs_string_new(njs_vm_t *vm, njs_value_t *value, const u_char *start,
+    uint32_t size, uint32_t length);
 u_char *njs_string_alloc(njs_vm_t *vm, njs_value_t *value, uint32_t size,
     uint32_t length)
     NXT_MALLOC_LIKE;