From 78c4af207087b95baeb47b0db18171411ce1ee78 Mon Sep 17 00:00:00 2001 From: Dmitry Volyntsev Date: Wed, 27 Mar 2019 21:00:18 +0300 Subject: [PATCH] Adding const qualifier njs_string_prop(). --- njs/njs_string.c | 6 +++--- njs/njs_string.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/njs/njs_string.c b/njs/njs_string.c index 3bc5d720..4ccd3aa9 100644 --- a/njs/njs_string.c +++ b/njs/njs_string.c @@ -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; } diff --git a/njs/njs_string.h b/njs/njs_string.h index 6273673f..314f76f3 100644 --- a/njs/njs_string.h +++ b/njs/njs_string.h @@ -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); -- 2.47.3