From: Dmitry Volyntsev Date: Sat, 18 May 2024 04:54:50 +0000 (-0700) Subject: Removing njs_string_set() from builtin functions. X-Git-Tag: 0.8.5~29 X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=cfeb2a622208b6ee330955d50f8a39394962ec4a;p=njs.git Removing njs_string_set() from builtin functions. This is the last function that produced byte strings. --- diff --git a/src/njs_builtin.c b/src/njs_builtin.c index 50a1fb02..e4c8d73c 100644 --- a/src/njs_builtin.c +++ b/src/njs_builtin.c @@ -1201,8 +1201,8 @@ njs_process_object_argv(njs_vm_t *vm, njs_object_prop_t *pr, i = 0; for (arg = vm->options.argv; i < vm->options.argc; arg++) { - njs_string_set(vm, &argv->start[i++], (u_char *) *arg, - njs_strlen(*arg)); + njs_string_create(vm, &argv->start[i++], (u_char *) *arg, + njs_strlen(*arg)); } prop = njs_object_prop_alloc(vm, &argv_string, &njs_value_undefined, 1); @@ -1265,7 +1265,7 @@ njs_env_hash_init(njs_vm_t *vm, njs_lvlhsh_t *hash, char **environment) continue; } - ret = njs_string_create(vm, &prop->name, (char *) entry, val - entry); + ret = njs_string_create(vm, &prop->name, entry, val - entry); if (njs_slow_path(ret != NJS_OK)) { return NJS_ERROR; } @@ -1285,8 +1285,7 @@ njs_env_hash_init(njs_vm_t *vm, njs_lvlhsh_t *hash, char **environment) val++; - ret = njs_string_create(vm, njs_prop_value(prop), (char *) val, - njs_strlen(val)); + ret = njs_string_create(vm, njs_prop_value(prop), val, njs_strlen(val)); if (njs_slow_path(ret != NJS_OK)) { return NJS_ERROR; } diff --git a/src/njs_error.c b/src/njs_error.c index de1cafa3..b1b62c89 100644 --- a/src/njs_error.c +++ b/src/njs_error.c @@ -147,7 +147,7 @@ njs_error_stack_new(njs_vm_t *vm, njs_object_t *error, njs_value_t *retval) return ret; } - return njs_string_set(vm, retval, string.start, string.length); + return njs_string_create(vm, retval, string.start, string.length); } diff --git a/src/njs_extern.c b/src/njs_extern.c index 329ed69d..df51f9b7 100644 --- a/src/njs_extern.c +++ b/src/njs_extern.c @@ -74,8 +74,9 @@ njs_external_add(njs_vm_t *vm, njs_arr_t *protos, lhq.key_hash = external->name.symbol; } else { - ret = njs_string_set(vm, &prop->name, external->name.string.start, - external->name.string.length); + ret = njs_string_create(vm, &prop->name, + external->name.string.start, + external->name.string.length); if (njs_slow_path(ret != NJS_OK)) { return NJS_ERROR; } diff --git a/src/njs_parser.c b/src/njs_parser.c index aa64cb41..570d65c0 100644 --- a/src/njs_parser.c +++ b/src/njs_parser.c @@ -9242,7 +9242,7 @@ njs_parser_error(njs_vm_t *vm, njs_object_type_t type, njs_str_t *file, njs_value_property_set(vm, &error, njs_value_arg(&line_number), &value); if (file->length != 0) { - ret = njs_string_set(vm, &value, file->start, file->length); + ret = njs_string_create(vm, &value, file->start, file->length); if (ret == NJS_OK) { njs_value_property_set(vm, &error, njs_value_arg(&file_name), &value); diff --git a/src/njs_regexp.c b/src/njs_regexp.c index 397f1236..e8bed14c 100644 --- a/src/njs_regexp.c +++ b/src/njs_regexp.c @@ -1144,8 +1144,8 @@ njs_regexp_exec_result(njs_vm_t *vm, njs_value_t *r, njs_utf8_t utf8, do { group = &pattern->groups[i]; - ret = njs_string_set(vm, &name, group->name.start, - group->name.length); + ret = njs_string_create(vm, &name, group->name.start, + group->name.length); if (njs_slow_path(ret != NJS_OK)) { goto fail; } diff --git a/src/njs_string.c b/src/njs_string.c index 702d652d..f5dd39d7 100644 --- a/src/njs_string.c +++ b/src/njs_string.c @@ -127,7 +127,7 @@ njs_string_set(njs_vm_t *vm, njs_value_t *value, const u_char *start, njs_int_t -njs_string_create(njs_vm_t *vm, njs_value_t *value, const char *src, +njs_string_create(njs_vm_t *vm, njs_value_t *value, const u_char *src, size_t size) { u_char *p, *p_end; @@ -3152,7 +3152,7 @@ njs_string_get_substitution(njs_vm_t *vm, njs_value_t *matched, p += 2; - ret = njs_string_create(vm, &name, (const char *) p, r - p); + ret = njs_string_create(vm, &name, p, r - p); if (njs_slow_path(ret != NJS_OK)) { goto exception; } diff --git a/src/njs_string.h b/src/njs_string.h index 1778f457..a4bfb8c8 100644 --- a/src/njs_string.h +++ b/src/njs_string.h @@ -103,13 +103,14 @@ typedef enum { } njs_trim_t; +/* njs_string_set() Is deprecated. */ njs_int_t njs_string_set(njs_vm_t *vm, njs_value_t *value, const u_char *start, uint32_t size); u_char *njs_string_alloc(njs_vm_t *vm, njs_value_t *value, uint64_t size, uint64_t length); njs_int_t njs_string_new(njs_vm_t *vm, njs_value_t *value, const u_char *start, uint32_t size, uint32_t length); -njs_int_t njs_string_create(njs_vm_t *vm, njs_value_t *value, const char *src, +njs_int_t njs_string_create(njs_vm_t *vm, njs_value_t *value, const u_char *src, size_t size); njs_int_t njs_string_create_chb(njs_vm_t *vm, njs_value_t *value, njs_chb_t *chain); diff --git a/src/njs_vm.c b/src/njs_vm.c index 9e4125f8..7a2b0632 100644 --- a/src/njs_vm.c +++ b/src/njs_vm.c @@ -843,7 +843,7 @@ njs_vm_value(njs_vm_t *vm, const njs_str_t *path, njs_value_t *retval) return NJS_ERROR; } - ret = njs_string_set(vm, &key, start, size); + ret = njs_string_create(vm, &key, start, size); if (njs_slow_path(ret != NJS_OK)) { return NJS_ERROR; } @@ -977,7 +977,7 @@ njs_int_t njs_vm_value_string_create(njs_vm_t *vm, njs_value_t *value, const u_char *start, uint32_t size) { - return njs_string_create(vm, value, (const char *) start, size); + return njs_string_create(vm, value, start, size); } diff --git a/src/test/njs_benchmark.c b/src/test/njs_benchmark.c index ac684b8f..523aa46e 100644 --- a/src/test/njs_benchmark.c +++ b/src/test/njs_benchmark.c @@ -715,7 +715,7 @@ njs_benchmark_string(njs_vm_t *vm, njs_value_t *args, njs_uint_t nargs, } else if (memcmp(mode.start, "create", 6) == 0) { for (i = 0; i < n; i++) { - njs_string_create(vm, &value, (char *) s.start, s.length); + njs_string_create(vm, &value, s.start, s.length); } } else {