From fd79c5960c48dfda2711bab7b74280938bd9633d Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Thu, 11 Feb 2016 18:10:34 +0300 Subject: [PATCH] Obsolete functions removal. --- njs/njs_string.c | 77 ------------------------------------------------ njs/njs_string.h | 2 -- njs/njs_vm.c | 42 -------------------------- njs/njscript.h | 2 -- 4 files changed, 123 deletions(-) diff --git a/njs/njs_string.c b/njs/njs_string.c index 95915d97..470bc2c1 100644 --- a/njs/njs_string.c +++ b/njs/njs_string.c @@ -1504,83 +1504,6 @@ njs_primitive_value_to_string(njs_vm_t *vm, njs_value_t *dst, } -njs_ret_t -njs_value_to_string(njs_vm_t *vm, njs_value_t *dst, const njs_value_t *src) -{ - njs_ret_t ret; - njs_param_t param; - njs_object_prop_t *prop; - const njs_value_t *value; - nxt_lvlhsh_query_t lhq; - - switch (src->type) { - - case NJS_NULL: - value = &njs_string_null; - break; - - case NJS_VOID: - value = &njs_string_void; - break; - - case NJS_BOOLEAN: - value = njs_is_true(src) ? &njs_string_true : &njs_string_false; - break; - - case NJS_NUMBER: - return njs_number_to_string(vm, dst, src); - - case NJS_STRING: - /* GC: njs_retain(src); */ - value = src; - break; - - case NJS_OBJECT: - case NJS_ARRAY: - case NJS_FUNCTION: - case NJS_REGEXP: - lhq.key_hash = NJS_TO_STRING_HASH; - lhq.key.len = sizeof("toString") - 1; - lhq.key.data = (u_char *) "toString"; - - prop = njs_object_property(vm, &src->data.u.array->object, &lhq); - - if (nxt_fast_path(prop != NULL)) { - param.this = (njs_value_t *) src; - param.args = NULL; - param.nargs = 0; - param.retval = (njs_index_t) dst; - - ret = njs_function_apply(vm, &prop->value, ¶m); - if (nxt_fast_path(ret == 0)) { - *dst = vm->retval; - return ret; - } - } - - return NXT_ERROR; - - /* - * TODO: - * function, regexp: find "toString()" in prototype chain: - * function: full function text. - * regex: full regexp text like "/regexp/gim". - */ - - case NJS_EXTERNAL: - value = &njs_string_native; - break; - - default: /* NJS_INVALID */ - return NXT_ERROR; - } - - *dst = *value; - - return NXT_OK; -} - - double njs_string_to_number(njs_value_t *value) { diff --git a/njs/njs_string.h b/njs/njs_string.h index 40fb2552..69ce39df 100644 --- a/njs/njs_string.h +++ b/njs/njs_string.h @@ -100,8 +100,6 @@ nxt_noinline uint32_t njs_string_index(njs_string_prop_t *string, uint32_t offset); njs_ret_t njs_primitive_value_to_string(njs_vm_t *vm, njs_value_t *dst, const njs_value_t *src); -njs_ret_t njs_value_to_string(njs_vm_t *vm, njs_value_t *dst, - const njs_value_t *src); double njs_string_to_number(njs_value_t *value); njs_index_t njs_value_index(njs_vm_t *vm, njs_parser_t *parser, diff --git a/njs/njs_vm.c b/njs/njs_vm.c index 859d320a..744e1e35 100644 --- a/njs/njs_vm.c +++ b/njs/njs_vm.c @@ -3217,48 +3217,6 @@ njs_vm_is_reentrant(njs_vm_t *vm) } -nxt_int_t -njs_value_string(njs_vm_t *vm, nxt_str_t *retval, njs_value_t *value, - njs_value_t **tmp) -{ - size_t size; - nxt_int_t ret; - njs_value_t *val; - - val = value; - *tmp = NULL; - - if (!njs_is_string(val)) { - val = nxt_mem_cache_alloc(vm->mem_cache_pool, sizeof(njs_value_t)); - if (nxt_slow_path(val == NULL)) { - return NXT_ERROR; - } - - ret = njs_value_to_string(vm, val, value); - if (nxt_slow_path(ret != NXT_OK)) { - /* TODO: njs_free(vm, val); */ - return ret; - } - - *tmp = val; - } - - size = val->short_string.size; - - if (size != NJS_STRING_LONG) { - retval->len = size; - retval->data = val->short_string.start; - - } else { - njs_retain(val); - retval->len = val->data.string_size; - retval->data = val->data.u.string->start; - } - - return NXT_OK; -} - - nxt_int_t njs_value_string_copy(njs_vm_t *vm, nxt_str_t *retval, njs_value_t *value, uintptr_t *next) diff --git a/njs/njscript.h b/njs/njscript.h index e5ebe06f..dbae4530 100644 --- a/njs/njscript.h +++ b/njs/njscript.h @@ -100,8 +100,6 @@ NXT_EXPORT njs_ret_t njs_void_set(njs_value_t *value); NXT_EXPORT void *njs_value_data(njs_value_t *value); NXT_EXPORT nxt_uint_t njs_vm_is_reentrant(njs_vm_t *vm); -NXT_EXPORT nxt_int_t njs_value_string(njs_vm_t *vm, nxt_str_t *retval, - njs_value_t *value, njs_value_t **tmp); NXT_EXPORT nxt_int_t njs_value_string_copy(njs_vm_t *vm, nxt_str_t *retval, njs_value_t *value, uintptr_t *next); -- 2.47.3