From c5a80752dc32a563acec553039c8b6801b1d79be Mon Sep 17 00:00:00 2001 From: hongzhidao Date: Mon, 4 Feb 2019 06:22:51 +0800 Subject: [PATCH] Renaming njs_exception_error_create() with njs_error_fmt_new(). --- njs/njs_error.c | 5 ++--- njs/njs_error.h | 18 +++++++++--------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/njs/njs_error.c b/njs/njs_error.c index 4f0259d6..b59c59de 100644 --- a/njs/njs_error.c +++ b/njs/njs_error.c @@ -37,11 +37,10 @@ njs_error_new(njs_vm_t *vm, njs_value_type_t type, u_char *start, size_t size) void -njs_exception_error_create(njs_vm_t *vm, njs_value_type_t type, - const char* fmt, ...) +njs_error_fmt_new(njs_vm_t *vm, njs_value_type_t type, const char* fmt, ...) { va_list args; - u_char buf[256], *p; + u_char buf[NXT_MAX_ERROR_STR], *p; p = buf; diff --git a/njs/njs_error.h b/njs/njs_error.h index 540eea21..f37f47c4 100644 --- a/njs/njs_error.h +++ b/njs/njs_error.h @@ -9,26 +9,26 @@ #define njs_error(vm, fmt, ...) \ - njs_exception_error_create(vm, NJS_OBJECT_ERROR, fmt, ##__VA_ARGS__) + njs_error_fmt_new(vm, NJS_OBJECT_ERROR, fmt, ##__VA_ARGS__) #define njs_eval_error(vm, fmt, ...) \ - njs_exception_error_create(vm, NJS_OBJECT_EVAL_ERROR, fmt, ##__VA_ARGS__) + njs_error_fmt_new(vm, NJS_OBJECT_EVAL_ERROR, fmt, ##__VA_ARGS__) #define njs_internal_error(vm, fmt, ...) \ - njs_exception_error_create(vm, NJS_OBJECT_INTERNAL_ERROR, fmt, \ + njs_error_fmt_new(vm, NJS_OBJECT_INTERNAL_ERROR, fmt, \ ##__VA_ARGS__) #define njs_range_error(vm, fmt, ...) \ - njs_exception_error_create(vm, NJS_OBJECT_RANGE_ERROR, fmt, ##__VA_ARGS__) + njs_error_fmt_new(vm, NJS_OBJECT_RANGE_ERROR, fmt, ##__VA_ARGS__) #define njs_reference_error(vm, fmt, ...) \ - njs_exception_error_create(vm, NJS_OBJECT_REF_ERROR, fmt, ##__VA_ARGS__) + njs_error_fmt_new(vm, NJS_OBJECT_REF_ERROR, fmt, ##__VA_ARGS__) #define njs_syntax_error(vm, fmt, ...) \ - njs_exception_error_create(vm, NJS_OBJECT_SYNTAX_ERROR, fmt, ##__VA_ARGS__) + njs_error_fmt_new(vm, NJS_OBJECT_SYNTAX_ERROR, fmt, ##__VA_ARGS__) #define njs_type_error(vm, fmt, ...) \ - njs_exception_error_create(vm, NJS_OBJECT_TYPE_ERROR, fmt, ##__VA_ARGS__) + njs_error_fmt_new(vm, NJS_OBJECT_TYPE_ERROR, fmt, ##__VA_ARGS__) #define njs_uri_error(vm, fmt, ...) \ - njs_exception_error_create(vm, NJS_OBJECT_URI_ERROR, fmt, ##__VA_ARGS__) + njs_error_fmt_new(vm, NJS_OBJECT_URI_ERROR, fmt, ##__VA_ARGS__) void njs_error_new(njs_vm_t *vm, njs_value_type_t type, u_char *start, size_t size); -void njs_exception_error_create(njs_vm_t *vm, njs_value_type_t type, +void njs_error_fmt_new(njs_vm_t *vm, njs_value_type_t type, const char* fmt, ...); void njs_memory_error(njs_vm_t *vm); -- 2.47.3