]> git.kaiwu.me - njs.git/commitdiff
Adding const qualifier njs_string_prop().
authorDmitry Volyntsev <xeioex@nginx.com>
Wed, 27 Mar 2019 18:00:18 +0000 (21:00 +0300)
committerDmitry Volyntsev <xeioex@nginx.com>
Wed, 27 Mar 2019 18:00:18 +0000 (21:00 +0300)
njs/njs_string.c
njs/njs_string.h

index 3bc5d720d87135048c15164c38956d23f640e5c2..4ccd3aa903f0ef57ffb7d31812a7a5a21c229e04 100644 (file)
@@ -511,7 +511,7 @@ njs_string_validate(njs_vm_t *vm, njs_string_prop_t *string, njs_value_t *value)
 
 
 nxt_noinline size_t
-njs_string_prop(njs_string_prop_t *string, njs_value_t *value)
+njs_string_prop(njs_string_prop_t *string, const njs_value_t *value)
 {
     size_t     size;
     uintptr_t  length;
@@ -519,11 +519,11 @@ njs_string_prop(njs_string_prop_t *string, njs_value_t *value)
     size = value->short_string.size;
 
     if (size != NJS_STRING_LONG) {
-        string->start = value->short_string.start;
+        string->start = (u_char *) value->short_string.start;
         length = value->short_string.length;
 
     } else {
-        string->start = value->long_string.data->start;
+        string->start = (u_char *) value->long_string.data->start;
         size = value->long_string.size;
         length = value->long_string.data->length;
     }
index 6273673f16f11521ce9825b2977385404c646680..314f76f325e683f0046823c457ccc0d917f01351 100644 (file)
@@ -144,7 +144,7 @@ void njs_string_copy(njs_value_t *dst, njs_value_t *src);
 njs_ret_t njs_string_validate(njs_vm_t *vm, njs_string_prop_t *string,
     njs_value_t *value);
 nxt_noinline size_t njs_string_prop(njs_string_prop_t *string,
-    njs_value_t *value);
+    const njs_value_t *value);
 njs_ret_t njs_string_constructor(njs_vm_t *vm, njs_value_t *args,
     nxt_uint_t nargs, njs_index_t unused);
 nxt_bool_t njs_string_eq(const njs_value_t *val1, const njs_value_t *val2);