diff --git a/src/nxt_app_log.c b/src/nxt_app_log.c index ae57c2a2f..92f0a9e57 100644 --- a/src/nxt_app_log.c +++ b/src/nxt_app_log.c @@ -9,24 +9,24 @@ static nxt_time_string_t nxt_log_error_time_cache; -static u_char *nxt_log_error_time(u_char *buf, nxt_realtime_t *now, +static char *nxt_log_error_time(char *buf, nxt_realtime_t *now, struct tm *tm, size_t size, const char *format); static nxt_time_string_t nxt_log_debug_time_cache; -static u_char *nxt_log_debug_time(u_char *buf, nxt_realtime_t *now, +static char *nxt_log_debug_time(char *buf, nxt_realtime_t *now, struct tm *tm, size_t size, const char *format); void nxt_cdecl nxt_log_time_handler(nxt_uint_t level, nxt_log_t *log, const char *fmt, ...) { - u_char *p, *end; + char *p, *end; #if 0 - u_char *syslogmsg; + char *syslogmsg; #endif va_list args; nxt_thread_t *thr; nxt_time_string_t *time_cache; - u_char msg[NXT_MAX_ERROR_STR]; + char msg[NXT_MAX_ERROR_STR]; thr = nxt_thread(); @@ -108,8 +108,8 @@ static nxt_time_string_t nxt_log_error_time_cache = { }; -static u_char * -nxt_log_error_time(u_char *buf, nxt_realtime_t *now, struct tm *tm, size_t size, +static char * +nxt_log_error_time(char *buf, nxt_realtime_t *now, struct tm *tm, size_t size, const char *format) { return nxt_sprintf(buf, buf + size, format, @@ -128,8 +128,8 @@ static nxt_time_string_t nxt_log_debug_time_cache = { }; -static u_char * -nxt_log_debug_time(u_char *buf, nxt_realtime_t *now, struct tm *tm, size_t size, +static char * +nxt_log_debug_time(char *buf, nxt_realtime_t *now, struct tm *tm, size_t size, const char *format) { return nxt_sprintf(buf, buf + size, format, diff --git a/src/nxt_application.c b/src/nxt_application.c index 629aa11c4..550aad531 100644 --- a/src/nxt_application.c +++ b/src/nxt_application.c @@ -63,7 +63,7 @@ static void nxt_proto_quit_children(nxt_task_t *task); static nxt_process_t *nxt_proto_process_find(nxt_task_t *task, nxt_pid_t pid); static void nxt_proto_process_add(nxt_task_t *task, nxt_process_t *process); static nxt_process_t *nxt_proto_process_remove(nxt_task_t *task, nxt_pid_t pid); -static u_char *nxt_cstr_dup(nxt_mp_t *mp, u_char *dst, u_char *src); +static char *nxt_cstr_dup(nxt_mp_t *mp, char *dst, char *src); static void nxt_proto_signal_handler(nxt_task_t *task, void *obj, void *data); static void nxt_proto_sigterm_handler(nxt_task_t *task, void *obj, void *data); static void nxt_proto_sigchld_handler(nxt_task_t *task, void *obj, void *data); @@ -207,7 +207,7 @@ static nxt_buf_t * nxt_discovery_modules(nxt_task_t *task, const char *path) { char *name; - u_char *p, *end; + char *p, *end; size_t size; glob_t glb; nxt_mp_t *mp; @@ -310,7 +310,7 @@ nxt_discovery_modules(nxt_task_t *task, const char *path) "\"data\": \"%s\"},", mnt[j].src, mnt[j].dst, mnt[j].name, mnt[j].type, mnt[j].flags, - mnt[j].data == NULL ? (u_char *) "" : mnt[j].data); + mnt[j].data == NULL ? (char *) "" : mnt[j].data); } *p++ = ']'; @@ -388,7 +388,7 @@ nxt_discovery_module(nxt_task_t *task, nxt_mp_t *mp, nxt_array_t *modules, module = modules->elts; n = modules->nelts; - version.start = (u_char *) app->version; + version.start = (char *) app->version; version.length = nxt_strlen(app->version); for (i = 0; i < n; i++) { @@ -603,7 +603,7 @@ nxt_proto_start(nxt_task_t *task, nxt_process_data_t *data) static void nxt_proto_start_process_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg) { - u_char *p; + char *p; nxt_int_t ret; nxt_port_t *port; nxt_runtime_t *rt; @@ -641,7 +641,7 @@ nxt_proto_start_process_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg) init->name = (const char *) nxt_app_conf->name.start; - p = (u_char *) process->name; + p = (char *) process->name; *p++ = '"'; p = nxt_cpymem(p, nxt_app_conf->name.start, nxt_app_conf->name.length); p = nxt_cpymem(p, "\" application", 13); @@ -968,7 +968,7 @@ nxt_app_set_logs(void) if (app_conf->stdout_log != NULL) { nxt_memzero(&file, sizeof(nxt_file_t)); file.log_level = 1; - file.name = (u_char *) app_conf->stdout_log; + file.name = (char *) app_conf->stdout_log; ret = nxt_file_open(task, &file, O_WRONLY | O_APPEND, O_CREAT, 0666); if (ret == NXT_ERROR) { return NXT_ERROR; @@ -981,7 +981,7 @@ nxt_app_set_logs(void) if (app_conf->stderr_log != NULL) { nxt_memzero(&file, sizeof(nxt_file_t)); file.log_level = 1; - file.name = (u_char *) app_conf->stderr_log; + file.name = (char *) app_conf->stderr_log; ret = nxt_file_open(task, &file, O_WRONLY | O_APPEND, O_CREAT, 0666); if (ret == NXT_ERROR) { return NXT_ERROR; @@ -995,10 +995,10 @@ nxt_app_set_logs(void) } -static u_char * -nxt_cstr_dup(nxt_mp_t *mp, u_char *dst, u_char *src) +static char * +nxt_cstr_dup(nxt_mp_t *mp, char *dst, char *src) { - u_char *p; + char *p; size_t len; len = nxt_strlen(src); @@ -1033,7 +1033,7 @@ nxt_app_setup(nxt_task_t *task, nxt_process_t *process) nxt_app_lang_module_t * nxt_app_lang_module(nxt_runtime_t *rt, nxt_str_t *name) { - u_char *p, *end, *version; + char *p, *end, *version; size_t version_length; nxt_uint_t i, n; nxt_app_type_t type; @@ -1084,7 +1084,7 @@ nxt_app_lang_module(nxt_runtime_t *rt, nxt_str_t *name) nxt_app_type_t -nxt_app_parse_type(u_char *p, size_t length) +nxt_app_parse_type(char *p, size_t length) { nxt_str_t str; @@ -1205,7 +1205,7 @@ nxt_proto_process_lhq_pid(nxt_lvlhsh_query_t *lhq, nxt_pid_t *pid) { lhq->key_hash = nxt_murmur_hash2(pid, sizeof(nxt_pid_t)); lhq->key.length = sizeof(nxt_pid_t); - lhq->key.start = (u_char *) pid; + lhq->key.start = (char *) pid; lhq->proto = &lvlhsh_processes_proto; } diff --git a/src/nxt_application.h b/src/nxt_application.h index a3b4230a0..290cbb953 100644 --- a/src/nxt_application.h +++ b/src/nxt_application.h @@ -36,7 +36,7 @@ typedef nxt_int_t (*nxt_application_setup_t)(nxt_task_t *task, typedef struct { nxt_app_type_t type; char *name; - u_char *version; + char *version; char *file; nxt_app_module_t *module; nxt_array_t *mounts; /* of nxt_fs_mount_t */ @@ -165,7 +165,7 @@ struct nxt_app_module_s { nxt_app_lang_module_t *nxt_app_lang_module(nxt_runtime_t *rt, nxt_str_t *name); -nxt_app_type_t nxt_app_parse_type(u_char *p, size_t length); +nxt_app_type_t nxt_app_parse_type(char *p, size_t length); NXT_EXPORT extern nxt_str_t nxt_server; extern nxt_app_module_t nxt_external_module; diff --git a/src/nxt_buf.h b/src/nxt_buf.h index a561ef4e1..ccf815561 100644 --- a/src/nxt_buf.h +++ b/src/nxt_buf.h @@ -57,10 +57,10 @@ */ typedef struct { - u_char *pos; - u_char *free; - u_char *start; - u_char *end; + char *pos; + char *free; + char *start; + char *end; } nxt_buf_mem_t; diff --git a/src/nxt_cert.c b/src/nxt_cert.c index 4a1f14961..dfc434b92 100644 --- a/src/nxt_cert.c +++ b/src/nxt_cert.c @@ -104,8 +104,8 @@ nxt_cert_bio(nxt_task_t *task, BIO *bio) EVP_PKEY *key; nxt_uint_t nalloc; nxt_cert_t *cert, *new_cert; - u_char *data; - const u_char *data_copy; + char *data; + const char *data_copy; PKCS8_PRIV_KEY_INFO *p8inf; const EVP_PKEY_ASN1_METHOD *ameth; @@ -493,14 +493,14 @@ nxt_cert_details(nxt_mp_t *mp, nxt_cert_t *cert) { BIO *bio; X509 *x509; - u_char *end; + char *end; EVP_PKEY *key; ASN1_TIME *asn1_time; nxt_str_t str; nxt_int_t ret; nxt_uint_t i; nxt_conf_value_t *object, *chain, *element, *value; - u_char buf[256]; + char buf[256]; static nxt_str_t key_str = nxt_string("key"); static nxt_str_t chain_str = nxt_string("chain"); @@ -658,7 +658,7 @@ nxt_cert_name_details(nxt_mp_t *mp, X509 *x509, nxt_bool_t issuer) nxt_uint_t i, n, count; nxt_conf_value_t *object, *names; STACK_OF(GENERAL_NAME) *alt_names; - u_char buf[256]; + char buf[256]; static nxt_cert_nid_t nids[] = { { NID_commonName, nxt_string("common_name") }, @@ -772,7 +772,7 @@ nxt_cert_alt_names_details(nxt_mp_t *mp, STACK_OF(GENERAL_NAME) *alt_names) str.length = ASN1_STRING_length(name->d.dNSName); #if OPENSSL_VERSION_NUMBER > 0x10100000L - str.start = (u_char *) ASN1_STRING_get0_data(name->d.dNSName); + str.start = (char *) ASN1_STRING_get0_data(name->d.dNSName); #else str.start = ASN1_STRING_data(name->d.dNSName); #endif @@ -815,7 +815,7 @@ nxt_cert_store_load(nxt_task_t *task, nxt_mp_t *mp) { DIR *dir; size_t size, alloc; - u_char *buf, *p; + char *buf, *p; nxt_str_t name; nxt_int_t ret; nxt_file_t file; @@ -855,7 +855,7 @@ nxt_cert_store_load(nxt_task_t *task, nxt_mp_t *mp) nxt_debug(task, "readdir(\"%s\"): \"%s\"", rt->certs.start, de->d_name); name.length = nxt_strlen(de->d_name); - name.start = (u_char *) de->d_name; + name.start = (char *) de->d_name; if (nxt_str_eq(&name, ".", 1) || nxt_str_eq(&name, "..", 2)) { continue; @@ -1123,7 +1123,7 @@ nxt_cert_buf_completion(nxt_task_t *task, void *obj, void *data) void nxt_cert_store_get_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg) { - u_char *p; + char *p; nxt_int_t ret; nxt_str_t name; nxt_file_t file; @@ -1213,7 +1213,7 @@ nxt_cert_store_delete(nxt_task_t *task, nxt_str_t *name, nxt_mp_t *mp) void nxt_cert_store_delete_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg) { - u_char *p; + char *p; nxt_str_t name; nxt_port_t *ctl_port; nxt_runtime_t *rt; diff --git a/src/nxt_cgroup.c b/src/nxt_cgroup.c index 79e240f1e..368c036cf 100644 --- a/src/nxt_cgroup.c +++ b/src/nxt_cgroup.c @@ -34,7 +34,7 @@ nxt_cgroup_proc_add(nxt_task_t *task, nxt_process_t *process) return NXT_ERROR; } - ret = nxt_fs_mkdir_p((const u_char *) cgprocs, 0777); + ret = nxt_fs_mkdir_p((const char *) cgprocs, 0777); if (nxt_slow_path(ret == NXT_ERROR)) { return NXT_ERROR; } diff --git a/src/nxt_clang.h b/src/nxt_clang.h index 94638346e..68f71805b 100644 --- a/src/nxt_clang.h +++ b/src/nxt_clang.h @@ -199,7 +199,7 @@ nxt_popcount(unsigned int x) #define nxt_container_of(p, type, field) \ - (type *) ((u_char *) (p) - offsetof(type, field)) + (type *) ((char *) (p) - offsetof(type, field)) #define nxt_pointer_to(p, offset) \ @@ -207,7 +207,7 @@ nxt_popcount(unsigned int x) #define nxt_value_at(type, p, offset) \ - *(type *) ((u_char *) p + offset) + *(type *) ((char *) p + offset) #define nxt_nitems(x) \ @@ -244,11 +244,11 @@ nxt_popcount(unsigned int x) #define nxt_align_ptr(p, a) \ - (u_char *) (((uintptr_t) (p) + ((uintptr_t) (a) - 1)) \ + (char *) (((uintptr_t) (p) + ((uintptr_t) (a) - 1)) \ & ~((uintptr_t) (a) - 1)) #define nxt_trunc_ptr(p, a) \ - (u_char *) ((uintptr_t) (p) & ~((uintptr_t) (a) - 1)) + (char *) ((uintptr_t) (p) & ~((uintptr_t) (a) - 1)) #define nxt_length(s) \ diff --git a/src/nxt_clone.c b/src/nxt_clone.c index e78a7822a..d0fb972e6 100644 --- a/src/nxt_clone.c +++ b/src/nxt_clone.c @@ -17,7 +17,7 @@ nxt_int_t nxt_clone_credential_map_set(nxt_task_t *task, const char* mapfile, pid_t pid, nxt_int_t default_container, nxt_int_t default_host, nxt_clone_credential_map_t *map); nxt_int_t nxt_clone_credential_map_write(nxt_task_t *task, const char *mapfile, - pid_t pid, u_char *mapinfo); + pid_t pid, char *mapinfo); nxt_int_t @@ -25,8 +25,8 @@ nxt_clone_credential_setgroups(nxt_task_t *task, pid_t child_pid, const char *str) { int fd, n; - u_char *p, *end; - u_char path[PATH_MAX]; + char *p, *end; + char path[PATH_MAX]; end = path + PATH_MAX; p = nxt_sprintf(path, end, "/proc/%d/setgroups", child_pid); @@ -68,12 +68,12 @@ nxt_clone_credential_setgroups(nxt_task_t *task, pid_t child_pid, nxt_int_t nxt_clone_credential_map_write(nxt_task_t *task, const char *mapfile, - pid_t pid, u_char *mapinfo) + pid_t pid, char *mapinfo) { int len, mapfd; - u_char *p, *end; + char *p, *end; ssize_t n; - u_char buf[256]; + char buf[256]; end = buf + sizeof(buf); @@ -121,7 +121,7 @@ nxt_clone_credential_map_set(nxt_task_t *task, const char* mapfile, pid_t pid, nxt_int_t default_container, nxt_int_t default_host, nxt_clone_credential_map_t *map) { - u_char *p, *end, *mapinfo; + char *p, *end, *mapinfo; nxt_int_t ret, len; nxt_uint_t i; diff --git a/src/nxt_conf.c b/src/nxt_conf.c index bb229c331..3911f7f51 100644 --- a/src/nxt_conf.c +++ b/src/nxt_conf.c @@ -47,15 +47,15 @@ typedef struct nxt_conf_object_s nxt_conf_object_t; struct nxt_conf_value_s { union { uint8_t boolean; /* 1 bit. */ - u_char number[NXT_CONF_MAX_NUMBER_LEN + 1]; + char number[NXT_CONF_MAX_NUMBER_LEN + 1]; struct { - u_char start[NXT_CONF_MAX_SHORT_STRING]; + char start[NXT_CONF_MAX_SHORT_STRING]; uint8_t length; } str; struct { - u_char *start; + char *start; uint32_t length; } nxt_packed string; @@ -93,34 +93,34 @@ struct nxt_conf_op_s { typedef struct { - u_char *start; - u_char *end; + char *start; + char *end; nxt_bool_t last; - u_char buf[NXT_CONF_MAX_TOKEN_LEN]; + char buf[NXT_CONF_MAX_TOKEN_LEN]; } nxt_conf_path_parse_t; static nxt_int_t nxt_conf_path_next_token(nxt_conf_path_parse_t *parse, nxt_str_t *token); -static u_char *nxt_conf_json_skip_space(u_char *start, const u_char *end); -static u_char *nxt_conf_json_parse_value(nxt_mp_t *mp, nxt_conf_value_t *value, - u_char *start, u_char *end, nxt_conf_json_error_t *error); -static u_char *nxt_conf_json_parse_object(nxt_mp_t *mp, nxt_conf_value_t *value, - u_char *start, u_char *end, nxt_conf_json_error_t *error); +static char *nxt_conf_json_skip_space(char *start, const char *end); +static char *nxt_conf_json_parse_value(nxt_mp_t *mp, nxt_conf_value_t *value, + char *start, char *end, nxt_conf_json_error_t *error); +static char *nxt_conf_json_parse_object(nxt_mp_t *mp, nxt_conf_value_t *value, + char *start, char *end, nxt_conf_json_error_t *error); static nxt_int_t nxt_conf_object_hash_add(nxt_mp_t *mp, nxt_lvlhsh_t *lvlhsh, nxt_conf_object_member_t *member); static nxt_int_t nxt_conf_object_hash_test(nxt_lvlhsh_query_t *lhq, void *data); static void *nxt_conf_object_hash_alloc(void *data, size_t size); static void nxt_conf_object_hash_free(void *data, void *p); -static u_char *nxt_conf_json_parse_array(nxt_mp_t *mp, nxt_conf_value_t *value, - u_char *start, u_char *end, nxt_conf_json_error_t *error); -static u_char *nxt_conf_json_parse_string(nxt_mp_t *mp, nxt_conf_value_t *value, - u_char *start, u_char *end, nxt_conf_json_error_t *error); -static u_char *nxt_conf_json_parse_number(nxt_mp_t *mp, nxt_conf_value_t *value, - u_char *start, u_char *end, nxt_conf_json_error_t *error); -static void nxt_conf_json_parse_error(nxt_conf_json_error_t *error, u_char *pos, +static char *nxt_conf_json_parse_array(nxt_mp_t *mp, nxt_conf_value_t *value, + char *start, char *end, nxt_conf_json_error_t *error); +static char *nxt_conf_json_parse_string(nxt_mp_t *mp, nxt_conf_value_t *value, + char *start, char *end, nxt_conf_json_error_t *error); +static char *nxt_conf_json_parse_number(nxt_mp_t *mp, nxt_conf_value_t *value, + char *start, char *end, nxt_conf_json_error_t *error); +static void nxt_conf_json_parse_error(nxt_conf_json_error_t *error, char *pos, const char *detail); static nxt_int_t nxt_conf_copy_value(nxt_mp_t *mp, const nxt_conf_op_t *op, @@ -131,27 +131,27 @@ static nxt_int_t nxt_conf_copy_object(nxt_mp_t *mp, const nxt_conf_op_t *op, nxt_conf_value_t *dst, const nxt_conf_value_t *src); static size_t nxt_conf_json_string_length(const nxt_conf_value_t *value); -static u_char *nxt_conf_json_print_string(u_char *p, +static char *nxt_conf_json_print_string(char *p, const nxt_conf_value_t *value); static size_t nxt_conf_json_array_length(const nxt_conf_value_t *value, nxt_conf_json_pretty_t *pretty); -static u_char *nxt_conf_json_print_array(u_char *p, +static char *nxt_conf_json_print_array(char *p, const nxt_conf_value_t *value, nxt_conf_json_pretty_t *pretty); static size_t nxt_conf_json_object_length(const nxt_conf_value_t *value, nxt_conf_json_pretty_t *pretty); -static u_char *nxt_conf_json_print_object(u_char *p, +static char *nxt_conf_json_print_object(char *p, const nxt_conf_value_t *value, nxt_conf_json_pretty_t *pretty); -static size_t nxt_conf_json_escape_length(u_char *p, size_t size); -static u_char *nxt_conf_json_escape(u_char *dst, u_char *src, size_t size); +static size_t nxt_conf_json_escape_length(char *p, size_t size); +static char *nxt_conf_json_escape(char *dst, char *src, size_t size); #define nxt_conf_json_newline(p) \ ((p)[0] = '\r', (p)[1] = '\n', (p) + 2) -nxt_inline u_char * -nxt_conf_json_indentation(u_char *p, uint32_t level) +nxt_inline char * +nxt_conf_json_indentation(char *p, uint32_t level) { while (level) { *p++ = '\t'; @@ -167,11 +167,11 @@ nxt_conf_get_string(const nxt_conf_value_t *value, nxt_str_t *str) { if (value->type == NXT_CONF_VALUE_SHORT_STRING) { str->length = value->u.str.length; - str->start = (u_char *) value->u.str.start; + str->start = (char *) value->u.str.start; } else { str->length = value->u.string.length; - str->start = (u_char *) value->u.string.start; + str->start = (char *) value->u.string.start; } } @@ -337,7 +337,7 @@ void nxt_conf_set_member_integer(nxt_conf_value_t *object, const nxt_str_t *name, int64_t value, uint32_t index) { - u_char *p, *end; + char *p, *end; nxt_conf_object_member_t *member; member = &object->u.object->members[index]; @@ -519,7 +519,7 @@ nxt_conf_get_path(nxt_conf_value_t *value, const nxt_str_t *path) static nxt_int_t nxt_conf_path_next_token(nxt_conf_path_parse_t *parse, nxt_str_t *token) { - u_char *p, *start, *end; + char *p, *start, *end; size_t length; start = parse->start + 1; @@ -1253,10 +1253,10 @@ nxt_conf_copy_object(nxt_mp_t *mp, const nxt_conf_op_t *op, nxt_conf_value_t * -nxt_conf_json_parse(nxt_mp_t *mp, u_char *start, u_char *end, +nxt_conf_json_parse(nxt_mp_t *mp, char *start, char *end, nxt_conf_json_error_t *error) { - u_char *p; + char *p; nxt_conf_value_t *value; value = nxt_mp_get(mp, sizeof(nxt_conf_value_t)); @@ -1298,10 +1298,10 @@ nxt_conf_json_parse(nxt_mp_t *mp, u_char *start, u_char *end, } -static u_char * -nxt_conf_json_skip_space(u_char *start, const u_char *end) +static char * +nxt_conf_json_skip_space(char *start, const char *end) { - u_char *p, ch; + char *p, ch; enum { sw_normal = 0, @@ -1383,11 +1383,11 @@ nxt_conf_json_skip_space(u_char *start, const u_char *end) } -static u_char * -nxt_conf_json_parse_value(nxt_mp_t *mp, nxt_conf_value_t *value, u_char *start, - u_char *end, nxt_conf_json_error_t *error) +static char * +nxt_conf_json_parse_value(nxt_mp_t *mp, nxt_conf_value_t *value, char *start, + char *end, nxt_conf_json_error_t *error) { - u_char ch, *p; + char ch, *p; ch = *start; @@ -1493,11 +1493,11 @@ static const nxt_lvlhsh_proto_t nxt_conf_object_hash_proto }; -static u_char * -nxt_conf_json_parse_object(nxt_mp_t *mp, nxt_conf_value_t *value, u_char *start, - u_char *end, nxt_conf_json_error_t *error) +static char * +nxt_conf_json_parse_object(nxt_mp_t *mp, nxt_conf_value_t *value, char *start, + char *end, nxt_conf_json_error_t *error) { - u_char *p, *name; + char *p, *name; nxt_mp_t *mp_temp; nxt_int_t rc; nxt_uint_t count; @@ -1720,11 +1720,11 @@ nxt_conf_object_hash_free(void *data, void *p) } -static u_char * -nxt_conf_json_parse_array(nxt_mp_t *mp, nxt_conf_value_t *value, u_char *start, - u_char *end, nxt_conf_json_error_t *error) +static char * +nxt_conf_json_parse_array(nxt_mp_t *mp, nxt_conf_value_t *value, char *start, + char *end, nxt_conf_json_error_t *error) { - u_char *p; + char *p; nxt_mp_t *mp_temp; nxt_uint_t count; nxt_list_t *list; @@ -1828,11 +1828,11 @@ nxt_conf_json_parse_array(nxt_mp_t *mp, nxt_conf_value_t *value, u_char *start, } -static u_char * -nxt_conf_json_parse_string(nxt_mp_t *mp, nxt_conf_value_t *value, u_char *start, - u_char *end, nxt_conf_json_error_t *error) +static char * +nxt_conf_json_parse_string(nxt_mp_t *mp, nxt_conf_value_t *value, char *start, + char *end, nxt_conf_json_error_t *error) { - u_char *p, ch, *last, *s; + char *p, ch, *last, *s; size_t size, surplus; uint32_t utf, utf_high; nxt_uint_t i; @@ -2089,11 +2089,11 @@ nxt_conf_json_parse_string(nxt_mp_t *mp, nxt_conf_value_t *value, u_char *start, } -static u_char * -nxt_conf_json_parse_number(nxt_mp_t *mp, nxt_conf_value_t *value, u_char *start, - u_char *end, nxt_conf_json_error_t *error) +static char * +nxt_conf_json_parse_number(nxt_mp_t *mp, nxt_conf_value_t *value, char *start, + char *end, nxt_conf_json_error_t *error) { - u_char *p, *s, ch, c, *dot_pos; + char *p, *s, ch, c, *dot_pos; size_t size; double num; @@ -2210,7 +2210,7 @@ nxt_conf_json_parse_number(nxt_mp_t *mp, nxt_conf_value_t *value, u_char *start, if (nxt_slow_path(end == NULL || *end != '\0')) { nxt_thread_log_alert("strtod(\"%s\", %s) failed %E", value->u.number, - end == NULL ? (u_char *) "NULL" : end, nxt_errno); + end == NULL ? (char *) "NULL" : end, nxt_errno); return NULL; } @@ -2222,7 +2222,7 @@ nxt_conf_json_parse_number(nxt_mp_t *mp, nxt_conf_value_t *value, u_char *start, static void -nxt_conf_json_parse_error(nxt_conf_json_error_t *error, u_char *pos, +nxt_conf_json_parse_error(nxt_conf_json_error_t *error, char *pos, const char *detail) { if (error == NULL) { @@ -2230,7 +2230,7 @@ nxt_conf_json_parse_error(nxt_conf_json_error_t *error, u_char *pos, } error->pos = pos; - error->detail = (u_char *) detail; + error->detail = (char *) detail; } @@ -2267,8 +2267,8 @@ nxt_conf_json_length(const nxt_conf_value_t *value, } -u_char * -nxt_conf_json_print(u_char *p, const nxt_conf_value_t *value, +char * +nxt_conf_json_print(char *p, const nxt_conf_value_t *value, nxt_conf_json_pretty_t *pretty) { switch (value->type) { @@ -2312,8 +2312,8 @@ nxt_conf_json_string_length(const nxt_conf_value_t *value) } -static u_char * -nxt_conf_json_print_string(u_char *p, const nxt_conf_value_t *value) +static char * +nxt_conf_json_print_string(char *p, const nxt_conf_value_t *value) { nxt_str_t str; @@ -2371,8 +2371,8 @@ nxt_conf_json_array_length(const nxt_conf_value_t *value, } -static u_char * -nxt_conf_json_print_array(u_char *p, const nxt_conf_value_t *value, +static char * +nxt_conf_json_print_array(char *p, const nxt_conf_value_t *value, nxt_conf_json_pretty_t *pretty) { nxt_uint_t n; @@ -2467,8 +2467,8 @@ nxt_conf_json_object_length(const nxt_conf_value_t *value, } -static u_char * -nxt_conf_json_print_object(u_char *p, const nxt_conf_value_t *value, +static char * +nxt_conf_json_print_object(char *p, const nxt_conf_value_t *value, nxt_conf_json_pretty_t *pretty) { nxt_uint_t n; @@ -2540,9 +2540,9 @@ nxt_conf_json_print_object(u_char *p, const nxt_conf_value_t *value, static size_t -nxt_conf_json_escape_length(u_char *p, size_t size) +nxt_conf_json_escape_length(char *p, size_t size) { - u_char ch; + char ch; size_t len; len = size; @@ -2576,10 +2576,10 @@ nxt_conf_json_escape_length(u_char *p, size_t size) } -static u_char * -nxt_conf_json_escape(u_char *dst, u_char *src, size_t size) +static char * +nxt_conf_json_escape(char *dst, char *src, size_t size) { - u_char ch; + char ch; while (size) { ch = *src++; @@ -2634,10 +2634,10 @@ nxt_conf_json_escape(u_char *dst, u_char *src, size_t size) void -nxt_conf_json_position(u_char *start, const u_char *pos, nxt_uint_t *line, +nxt_conf_json_position(char *start, const char *pos, nxt_uint_t *line, nxt_uint_t *column) { - u_char *p; + char *p; ssize_t symbols; nxt_uint_t lines; diff --git a/src/nxt_conf.h b/src/nxt_conf.h index 493d64801..ebc1d9ba2 100644 --- a/src/nxt_conf.h +++ b/src/nxt_conf.h @@ -34,8 +34,8 @@ typedef struct nxt_conf_op_s nxt_conf_op_t; typedef struct { - u_char *pos; - u_char *detail; + char *pos; + char *detail; } nxt_conf_json_error_t; @@ -102,7 +102,7 @@ nxt_conf_op_ret_t nxt_conf_op_compile(nxt_mp_t *mp, nxt_conf_op_t **ops, nxt_conf_value_t *nxt_conf_clone(nxt_mp_t *mp, nxt_conf_op_t *op, const nxt_conf_value_t *value); -nxt_conf_value_t *nxt_conf_json_parse(nxt_mp_t *mp, u_char *start, u_char *end, +nxt_conf_value_t *nxt_conf_json_parse(nxt_mp_t *mp, char *start, char *end, nxt_conf_json_error_t *error); #define nxt_conf_json_parse_str(mp, str) \ @@ -110,9 +110,9 @@ nxt_conf_value_t *nxt_conf_json_parse(nxt_mp_t *mp, u_char *start, u_char *end, size_t nxt_conf_json_length(const nxt_conf_value_t *value, nxt_conf_json_pretty_t *pretty); -u_char *nxt_conf_json_print(u_char *p, const nxt_conf_value_t *value, +char *nxt_conf_json_print(char *p, const nxt_conf_value_t *value, nxt_conf_json_pretty_t *pretty); -void nxt_conf_json_position(u_char *start, const u_char *pos, nxt_uint_t *line, +void nxt_conf_json_position(char *start, const char *pos, nxt_uint_t *line, nxt_uint_t *column); nxt_int_t nxt_conf_validate(nxt_conf_validation_t *vldt); diff --git a/src/nxt_conf_validation.c b/src/nxt_conf_validation.c index 5d7f7c52b..c0bc57012 100644 --- a/src/nxt_conf_validation.c +++ b/src/nxt_conf_validation.c @@ -1433,7 +1433,7 @@ nxt_int_t nxt_conf_validate(nxt_conf_validation_t *vldt) { nxt_int_t ret; - u_char error[NXT_MAX_ERROR_STR]; + char error[NXT_MAX_ERROR_STR]; vldt->tstr_state = nxt_tstr_state_new(vldt->pool, 1); if (nxt_slow_path(vldt->tstr_state == NULL)) { @@ -1469,11 +1469,11 @@ static nxt_int_t nxt_conf_vldt_type(nxt_conf_validation_t *vldt, const nxt_str_t *name, nxt_conf_value_t *value, nxt_conf_vldt_type_t type) { - u_char *p; + char *p; nxt_str_t expected; nxt_bool_t comma; nxt_uint_t value_type, n, t; - u_char buf[nxt_length(NXT_CONF_VLDT_ANY_TYPE_STR)]; + char buf[nxt_length(NXT_CONF_VLDT_ANY_TYPE_STR)]; static const nxt_str_t type_name[] = { nxt_string("a null"), @@ -1543,10 +1543,10 @@ nxt_conf_vldt_type(nxt_conf_validation_t *vldt, const nxt_str_t *name, static nxt_int_t nxt_conf_vldt_error(nxt_conf_validation_t *vldt, const char *fmt, ...) { - u_char *p, *end; + char *p, *end; size_t size; va_list args; - u_char error[NXT_MAX_ERROR_STR]; + char error[NXT_MAX_ERROR_STR]; va_start(args, fmt); end = nxt_vsprintf(error, error + NXT_MAX_ERROR_STR, fmt, args); @@ -1581,7 +1581,7 @@ static nxt_int_t nxt_conf_vldt_var(nxt_conf_validation_t *vldt, const nxt_str_t *name, nxt_str_t *value) { - u_char error[NXT_MAX_ERROR_STR]; + char error[NXT_MAX_ERROR_STR]; if (nxt_tstr_test(vldt->tstr_state, value, error) != NXT_OK) { return nxt_conf_vldt_error(vldt, "%s in the \"%V\" value.", @@ -2323,7 +2323,7 @@ static nxt_int_t nxt_conf_vldt_match_encoded_patterns_set_member(nxt_conf_validation_t *vldt, nxt_str_t *name, nxt_conf_value_t *value) { - u_char *p, *end; + char *p, *end; if (nxt_slow_path(name->length == 0)) { return nxt_conf_vldt_error(vldt, "The \"match\" pattern objects must " @@ -2373,7 +2373,7 @@ static nxt_int_t nxt_conf_vldt_match_encoded_pattern(nxt_conf_validation_t *vldt, nxt_conf_value_t *value) { - u_char *p, *end; + char *p, *end; nxt_int_t ret; nxt_str_t pattern; diff --git a/src/nxt_controller.c b/src/nxt_controller.c index 1ffcf815a..8f7d77f06 100644 --- a/src/nxt_controller.c +++ b/src/nxt_controller.c @@ -33,7 +33,7 @@ typedef struct { nxt_uint_t status; nxt_conf_value_t *conf; - u_char *title; + char *title; nxt_str_t detail; ssize_t offset; nxt_uint_t line; @@ -121,7 +121,7 @@ static void nxt_controller_conf_store(nxt_task_t *task, nxt_conf_value_t *conf); static void nxt_controller_response(nxt_task_t *task, nxt_controller_request_t *req, nxt_controller_response_t *resp); -static u_char *nxt_controller_date(u_char *buf, nxt_realtime_t *now, +static char *nxt_controller_date(char *buf, nxt_realtime_t *now, struct tm *tm, size_t size, const char *format); @@ -589,7 +589,7 @@ nxt_controller_conf_send(nxt_task_t *task, nxt_mp_t *mp, nxt_conf_value_t *conf, nxt_port_rpc_handler_t handler, void *data) { void *mem; - u_char *end; + char *end; size_t size; uint32_t stream; nxt_fd_t fd; @@ -628,7 +628,7 @@ nxt_controller_conf_send(nxt_task_t *task, nxt_mp_t *mp, nxt_conf_value_t *conf, nxt_mem_munmap(mem, size); - size = end - (u_char *) mem; + size = end - (char *) mem; b->mem.free = nxt_cpymem(b->mem.pos, &size, sizeof(size_t)); @@ -695,7 +695,7 @@ nxt_runtime_controller_socket(nxt_task_t *task, nxt_runtime_t *rt) if (ls->sockaddr->u.sockaddr.sa_family == AF_UNIX) { const char *path = ls->sockaddr->u.sockaddr_un.sun_path; - nxt_fs_mkdir_p_dirname((const u_char *) path, 0755); + nxt_fs_mkdir_p_dirname((const char *) path, 0755); } #endif @@ -1237,7 +1237,7 @@ nxt_controller_process_request(nxt_task_t *task, nxt_controller_request_t *req) } resp.status = 404; - resp.title = (u_char *) "Value doesn't exist."; + resp.title = (char *) "Value doesn't exist."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -1246,7 +1246,7 @@ nxt_controller_process_request(nxt_task_t *task, nxt_controller_request_t *req) invalid_method: resp.status = 405; - resp.title = (u_char *) "Invalid method."; + resp.title = (char *) "Invalid method."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -1255,7 +1255,7 @@ nxt_controller_process_request(nxt_task_t *task, nxt_controller_request_t *req) alloc_fail: resp.status = 500; - resp.title = (u_char *) "Memory allocation failed."; + resp.title = (char *) "Memory allocation failed."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -1344,7 +1344,7 @@ nxt_controller_process_config(nxt_task_t *task, nxt_controller_request_t *req, } resp.status = 400; - resp.title = (u_char *) "Invalid JSON."; + resp.title = (char *) "Invalid JSON."; resp.detail.length = nxt_strlen(error.detail); resp.detail.start = error.detail; resp.offset = error.pos - mbuf->pos; @@ -1509,7 +1509,7 @@ nxt_controller_process_config(nxt_task_t *task, nxt_controller_request_t *req, not_allowed: resp.status = 405; - resp.title = (u_char *) "Method isn't allowed."; + resp.title = (char *) "Method isn't allowed."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -1518,7 +1518,7 @@ nxt_controller_process_config(nxt_task_t *task, nxt_controller_request_t *req, not_found: resp.status = 404; - resp.title = (u_char *) "Value doesn't exist."; + resp.title = (char *) "Value doesn't exist."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -1527,7 +1527,7 @@ nxt_controller_process_config(nxt_task_t *task, nxt_controller_request_t *req, invalid_conf: resp.status = 400; - resp.title = (u_char *) "Invalid configuration."; + resp.title = (char *) "Invalid configuration."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -1536,7 +1536,7 @@ nxt_controller_process_config(nxt_task_t *task, nxt_controller_request_t *req, alloc_fail: resp.status = 500; - resp.title = (u_char *) "Memory allocation failed."; + resp.title = (char *) "Memory allocation failed."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -1612,7 +1612,7 @@ nxt_controller_process_status(nxt_task_t *task, nxt_controller_request_t *req) nxt_memzero(&resp, sizeof(nxt_controller_response_t)); resp.status = 500; - resp.title = (u_char *) "Failed to get status."; + resp.title = (char *) "Failed to get status."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -1645,7 +1645,7 @@ nxt_controller_status_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg, nxt_memzero(&resp, sizeof(nxt_controller_response_t)); resp.status = 500; - resp.title = (u_char *) "Failed to get status."; + resp.title = (char *) "Failed to get status."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -1672,7 +1672,7 @@ nxt_controller_status_response(nxt_task_t *task, nxt_controller_request_t *req, if (status == NULL) { resp.status = 404; - resp.title = (u_char *) "Invalid path."; + resp.title = (char *) "Invalid path."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -1692,7 +1692,7 @@ static void nxt_controller_process_cert(nxt_task_t *task, nxt_controller_request_t *req, nxt_str_t *path) { - u_char *p; + char *p; nxt_str_t name; nxt_int_t ret; nxt_conn_t *c; @@ -1789,14 +1789,14 @@ nxt_controller_process_cert(nxt_task_t *task, nxt_cert_store_delete(task, &name, c->mem_pool); resp.status = 200; - resp.title = (u_char *) "Certificate deleted."; + resp.title = (char *) "Certificate deleted."; nxt_controller_response(task, req, &resp); return; } resp.status = 405; - resp.title = (u_char *) "Invalid method."; + resp.title = (char *) "Invalid method."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -1805,7 +1805,7 @@ nxt_controller_process_cert(nxt_task_t *task, invalid_name: resp.status = 400; - resp.title = (u_char *) "Invalid certificate name."; + resp.title = (char *) "Invalid certificate name."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -1814,7 +1814,7 @@ nxt_controller_process_cert(nxt_task_t *task, invalid_cert: resp.status = 400; - resp.title = (u_char *) "Invalid certificate."; + resp.title = (char *) "Invalid certificate."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -1823,7 +1823,7 @@ nxt_controller_process_cert(nxt_task_t *task, exists_cert: resp.status = 400; - resp.title = (u_char *) "Certificate already exists."; + resp.title = (char *) "Certificate already exists."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -1832,7 +1832,7 @@ nxt_controller_process_cert(nxt_task_t *task, cert_in_use: resp.status = 400; - resp.title = (u_char *) "Certificate is used in the configuration."; + resp.title = (char *) "Certificate is used in the configuration."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -1841,7 +1841,7 @@ nxt_controller_process_cert(nxt_task_t *task, cert_not_found: resp.status = 404; - resp.title = (u_char *) "Certificate doesn't exist."; + resp.title = (char *) "Certificate doesn't exist."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -1850,7 +1850,7 @@ nxt_controller_process_cert(nxt_task_t *task, not_found: resp.status = 404; - resp.title = (u_char *) "Invalid path."; + resp.title = (char *) "Invalid path."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -1859,7 +1859,7 @@ nxt_controller_process_cert(nxt_task_t *task, alloc_fail: resp.status = 500; - resp.title = (u_char *) "Memory allocation failed."; + resp.title = (char *) "Memory allocation failed."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -1882,7 +1882,7 @@ nxt_controller_process_cert_save(nxt_task_t *task, nxt_port_recv_msg_t *msg, if (msg == NULL || msg->port_msg.type == _NXT_PORT_MSG_RPC_ERROR) { resp.status = 500; - resp.title = (u_char *) "Failed to store certificate."; + resp.title = (char *) "Failed to store certificate."; nxt_controller_response(task, req, &resp); return; @@ -1899,7 +1899,7 @@ nxt_controller_process_cert_save(nxt_task_t *task, nxt_port_recv_msg_t *msg, nxt_memzero(&resp, sizeof(nxt_controller_response_t)); resp.status = 200; - resp.title = (u_char *) "Certificate chain uploaded."; + resp.title = (char *) "Certificate chain uploaded."; nxt_controller_response(task, req, &resp); } @@ -1968,7 +1968,7 @@ static void nxt_controller_process_script(nxt_task_t *task, nxt_controller_request_t *req, nxt_str_t *path) { - u_char *p; + char *p; nxt_int_t ret; nxt_str_t name; nxt_conn_t *c; @@ -1976,7 +1976,7 @@ nxt_controller_process_script(nxt_task_t *task, nxt_buf_mem_t *bm; nxt_conf_value_t *value; nxt_controller_response_t resp; - u_char error[NXT_MAX_ERROR_STR]; + char error[NXT_MAX_ERROR_STR]; name.length = path->length - 1; name.start = path->start + 1; @@ -2070,14 +2070,14 @@ nxt_controller_process_script(nxt_task_t *task, nxt_script_store_delete(task, &name, c->mem_pool); resp.status = 200; - resp.title = (u_char *) "JS module deleted."; + resp.title = (char *) "JS module deleted."; nxt_controller_response(task, req, &resp); return; } resp.status = 405; - resp.title = (u_char *) "Invalid method."; + resp.title = (char *) "Invalid method."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -2086,7 +2086,7 @@ nxt_controller_process_script(nxt_task_t *task, invalid_name: resp.status = 400; - resp.title = (u_char *) "Invalid JS module name."; + resp.title = (char *) "Invalid JS module name."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -2095,7 +2095,7 @@ nxt_controller_process_script(nxt_task_t *task, invalid_script: resp.status = 400; - resp.title = (u_char *) "Invalid JS module."; + resp.title = (char *) "Invalid JS module."; resp.offset = -1; resp.detail.start = error; @@ -2107,7 +2107,7 @@ nxt_controller_process_script(nxt_task_t *task, exists_script: resp.status = 400; - resp.title = (u_char *) "JS module already exists."; + resp.title = (char *) "JS module already exists."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -2116,7 +2116,7 @@ nxt_controller_process_script(nxt_task_t *task, script_in_use: resp.status = 400; - resp.title = (u_char *) "JS module is used in the configuration."; + resp.title = (char *) "JS module is used in the configuration."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -2125,7 +2125,7 @@ nxt_controller_process_script(nxt_task_t *task, script_not_found: resp.status = 404; - resp.title = (u_char *) "JS module doesn't exist."; + resp.title = (char *) "JS module doesn't exist."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -2134,7 +2134,7 @@ nxt_controller_process_script(nxt_task_t *task, not_found: resp.status = 404; - resp.title = (u_char *) "Invalid path."; + resp.title = (char *) "Invalid path."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -2143,7 +2143,7 @@ nxt_controller_process_script(nxt_task_t *task, alloc_fail: resp.status = 500; - resp.title = (u_char *) "Memory allocation failed."; + resp.title = (char *) "Memory allocation failed."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -2165,7 +2165,7 @@ nxt_controller_process_script_save(nxt_task_t *task, nxt_port_recv_msg_t *msg, if (msg == NULL || msg->port_msg.type == _NXT_PORT_MSG_RPC_ERROR) { resp.status = 500; - resp.title = (u_char *) "Failed to store script."; + resp.title = (char *) "Failed to store script."; nxt_controller_response(task, req, &resp); return; @@ -2182,7 +2182,7 @@ nxt_controller_process_script_save(nxt_task_t *task, nxt_port_recv_msg_t *msg, nxt_memzero(&resp, sizeof(nxt_controller_response_t)); resp.status = 200; - resp.title = (u_char *) "JS module uploaded."; + resp.title = (char *) "JS module uploaded."; nxt_controller_response(task, req, &resp); } @@ -2274,13 +2274,13 @@ nxt_controller_conf_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg, nxt_controller_conf_store(task, req->conf.root); resp.status = 200; - resp.title = (u_char *) "Reconfiguration done."; + resp.title = (char *) "Reconfiguration done."; } else { nxt_mp_destroy(req->conf.pool); resp.status = 500; - resp.title = (u_char *) "Failed to apply new configuration."; + resp.title = (char *) "Failed to apply new configuration."; resp.offset = -1; } @@ -2374,7 +2374,7 @@ nxt_controller_process_control(nxt_task_t *task, not_allowed: resp.status = 405; - resp.title = (u_char *) "Method isn't allowed."; + resp.title = (char *) "Method isn't allowed."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -2383,7 +2383,7 @@ nxt_controller_process_control(nxt_task_t *task, not_found: resp.status = 404; - resp.title = (u_char *) "Value doesn't exist."; + resp.title = (char *) "Value doesn't exist."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -2392,7 +2392,7 @@ nxt_controller_process_control(nxt_task_t *task, alloc_fail: resp.status = 500; - resp.title = (u_char *) "Memory allocation failed."; + resp.title = (char *) "Memory allocation failed."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -2401,7 +2401,7 @@ nxt_controller_process_control(nxt_task_t *task, fail: resp.status = 500; - resp.title = (u_char *) "Send restart failed."; + resp.title = (char *) "Send restart failed."; resp.offset = -1; nxt_controller_response(task, req, &resp); @@ -2425,11 +2425,11 @@ nxt_controller_app_restart_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg, if (msg->port_msg.type == NXT_PORT_MSG_RPC_READY) { resp.status = 200; - resp.title = (u_char *) "Ok"; + resp.title = (char *) "Ok"; } else { resp.status = 500; - resp.title = (u_char *) "Failed to restart app."; + resp.title = (char *) "Failed to restart app."; resp.offset = -1; } @@ -2443,7 +2443,7 @@ static void nxt_controller_conf_store(nxt_task_t *task, nxt_conf_value_t *conf) { void *mem; - u_char *end; + char *end; size_t size; nxt_fd_t fd; nxt_buf_t *b; @@ -2470,7 +2470,7 @@ nxt_controller_conf_store(nxt_task_t *task, nxt_conf_value_t *conf) nxt_mem_munmap(mem, size); - size = end - (u_char *) mem; + size = end - (char *) mem; b = nxt_buf_mem_alloc(task->thread->engine->mem_pool, sizeof(size_t), 0); if (nxt_slow_path(b == NULL)) { @@ -2665,8 +2665,8 @@ nxt_controller_response(nxt_task_t *task, nxt_controller_request_t *req, } -static u_char * -nxt_controller_date(u_char *buf, nxt_realtime_t *now, struct tm *tm, +static char * +nxt_controller_date(char *buf, nxt_realtime_t *now, struct tm *tm, size_t size, const char *format) { static const char * const week[] = { "Sun", "Mon", "Tue", "Wed", "Thu", diff --git a/src/nxt_credential.c b/src/nxt_credential.c index 1c9fa9a7a..0c6034c17 100644 --- a/src/nxt_credential.c +++ b/src/nxt_credential.c @@ -66,9 +66,9 @@ nxt_credential_get(nxt_task_t *task, nxt_mp_t *mp, nxt_credential_t *uc, #if (NXT_DEBUG) { - u_char *p, *end; + char *p, *end; nxt_uint_t i; - u_char msg[NXT_MAX_ERROR_STR]; + char msg[NXT_MAX_ERROR_STR]; p = msg; end = msg + NXT_MAX_ERROR_STR; diff --git a/src/nxt_cyassl.c b/src/nxt_cyassl.c index 91039e0c5..dbc6f76e2 100644 --- a/src/nxt_cyassl.c +++ b/src/nxt_cyassl.c @@ -41,7 +41,7 @@ static nxt_uint_t nxt_cyassl_log_error_level(nxt_event_conn_t *c, nxt_err_t err, int ssl_error); static void nxt_cdecl nxt_cyassl_log_error(nxt_uint_t level, nxt_log_t *log, int ret, const char *fmt, ...); -static u_char *nxt_cyassl_copy_error(int err, u_char *p, u_char *end); +static char *nxt_cyassl_copy_error(int err, char *p, char *end); const nxt_ssltls_lib_t nxt_cyassl_lib = { @@ -249,7 +249,7 @@ nxt_cyassl_io_recv(CYASSL *ssl, char *buf, int size, void *data) c = data; thr = nxt_thread(); - n = thr->engine->event->io->recv(c, (u_char *) buf, size, 0); + n = thr->engine->event->io->recv(c, (char *) buf, size, 0); if (n > 0) { return n; @@ -277,7 +277,7 @@ nxt_cyassl_io_send(CYASSL *ssl, char *buf, int size, void *data) c = data; thr = nxt_thread(); - n = thr->engine->event->io->send(c, (u_char *) buf, size); + n = thr->engine->event->io->send(c, (char *) buf, size); if (n > 0) { return n; @@ -535,11 +535,11 @@ nxt_cyassl_conn_test_error(nxt_thread_t *thr, nxt_event_conn_t *c, int ret, static void nxt_cdecl nxt_cyassl_conn_error(nxt_event_conn_t *c, nxt_err_t err, const char *fmt, ...) { - u_char *p, *end; + char *p, *end; va_list args; nxt_uint_t level; nxt_cyassl_conn_t *ssltls; - u_char msg[NXT_MAX_ERROR_STR]; + char msg[NXT_MAX_ERROR_STR]; ssltls = c->u.ssltls; @@ -585,9 +585,9 @@ static void nxt_cdecl nxt_cyassl_log_error(nxt_uint_t level, nxt_log_t *log, int err, const char *fmt, ...) { - u_char *p, *end; + char *p, *end; va_list args; - u_char msg[NXT_MAX_ERROR_STR]; + char msg[NXT_MAX_ERROR_STR]; if (nxt_log_level_enough(log, level)) { @@ -604,8 +604,8 @@ nxt_cyassl_log_error(nxt_uint_t level, nxt_log_t *log, int err, } -static u_char * -nxt_cyassl_copy_error(int err, u_char *p, u_char *end) +static char * +nxt_cyassl_copy_error(int err, char *p, char *end) { p = nxt_sprintf(p, end, " (SSL:%d ", err); diff --git a/src/nxt_djb_hash.c b/src/nxt_djb_hash.c index cd3158693..3cc49f76a 100644 --- a/src/nxt_djb_hash.c +++ b/src/nxt_djb_hash.c @@ -11,7 +11,7 @@ uint32_t nxt_djb_hash(const void *data, size_t len) { uint32_t hash; - const u_char *p; + const char *p; p = data; hash = NXT_DJB_HASH_INIT; @@ -28,9 +28,9 @@ nxt_djb_hash(const void *data, size_t len) uint32_t nxt_djb_hash_lowcase(const void *data, size_t len) { - u_char c; + char c; uint32_t hash; - const u_char *p; + const char *p; p = data; hash = NXT_DJB_HASH_INIT; diff --git a/src/nxt_errno.c b/src/nxt_errno.c index 47479a82f..3ddf44036 100644 --- a/src/nxt_errno.c +++ b/src/nxt_errno.c @@ -22,9 +22,9 @@ * causing false bug reports. */ -static u_char *nxt_bootstrap_strerror(nxt_err_t err, u_char *errstr, +static char *nxt_bootstrap_strerror(nxt_err_t err, char *errstr, size_t size); -static u_char *nxt_runtime_strerror(nxt_err_t err, u_char *errstr, size_t size); +static char *nxt_runtime_strerror(nxt_err_t err, char *errstr, size_t size); nxt_strerror_t nxt_strerror = nxt_bootstrap_strerror; @@ -36,7 +36,7 @@ nxt_int_t nxt_strerror_start(void) { char *msg; - u_char *p; + char *p; size_t size, length, n; nxt_uint_t err, invalid; @@ -129,15 +129,15 @@ nxt_strerror_start(void) } -static u_char * -nxt_bootstrap_strerror(nxt_err_t err, u_char *errstr, size_t size) +static char * +nxt_bootstrap_strerror(nxt_err_t err, char *errstr, size_t size) { - return nxt_cpystrn(errstr, (u_char *) strerror(err), size); + return nxt_cpystrn(errstr, (char *) strerror(err), size); } -static u_char * -nxt_runtime_strerror(nxt_err_t err, u_char *errstr, size_t size) +static char * +nxt_runtime_strerror(nxt_err_t err, char *errstr, size_t size) { nxt_str_t *msg; nxt_uint_t n; diff --git a/src/nxt_errno.h b/src/nxt_errno.h index f19d50bab..1a271b2a3 100644 --- a/src/nxt_errno.h +++ b/src/nxt_errno.h @@ -81,7 +81,7 @@ typedef int nxt_err_t; nxt_int_t nxt_strerror_start(void); -typedef u_char *(*nxt_strerror_t)(nxt_err_t err, u_char *errstr, size_t size); +typedef char *(*nxt_strerror_t)(nxt_err_t err, char *errstr, size_t size); extern nxt_strerror_t nxt_strerror; diff --git a/src/nxt_event_engine.c b/src/nxt_event_engine.c index 78c79bb1a..8d2291a39 100644 --- a/src/nxt_event_engine.c +++ b/src/nxt_event_engine.c @@ -266,7 +266,7 @@ nxt_event_engine_post(nxt_event_engine_t *engine, nxt_work_t *work) void nxt_event_engine_signal(nxt_event_engine_t *engine, nxt_uint_t signo) { - u_char buf; + char buf; nxt_debug(&engine->task, "event engine signal:%ui", signo); @@ -289,10 +289,10 @@ static void nxt_event_engine_signal_pipe(nxt_task_t *task, void *obj, void *data) { int i, n; - u_char signo; + char signo; nxt_bool_t post; nxt_fd_event_t *ev; - u_char buf[128]; + char buf[128]; ev = obj; diff --git a/src/nxt_external.c b/src/nxt_external.c index c724b9bd2..c8e0d34ea 100644 --- a/src/nxt_external.c +++ b/src/nxt_external.c @@ -60,8 +60,8 @@ static nxt_int_t nxt_external_start(nxt_task_t *task, nxt_process_data_t *data) { char **argv; - u_char buf[256]; - u_char *p, *end; + char buf[256]; + char *p, *end; uint32_t index; size_t size; nxt_str_t str; @@ -179,7 +179,7 @@ nxt_external_start(nxt_task_t *task, nxt_process_data_t *data) i = 1; if (c->arguments != NULL) { - p = (u_char *) &argv[argc]; + p = (char *) &argv[argc]; for (index = 0; /* void */ ; index++) { value = nxt_conf_get_array_element(c->arguments, index); diff --git a/src/nxt_file.c b/src/nxt_file.c index 4047d9d7c..cc5244ef7 100644 --- a/src/nxt_file.c +++ b/src/nxt_file.c @@ -99,7 +99,7 @@ nxt_file_close(nxt_task_t *task, nxt_file_t *file) ssize_t -nxt_file_write(nxt_file_t *file, const u_char *buf, size_t size, +nxt_file_write(nxt_file_t *file, const char *buf, size_t size, nxt_off_t offset) { ssize_t n; @@ -128,7 +128,7 @@ nxt_file_write(nxt_file_t *file, const u_char *buf, size_t size, ssize_t -nxt_file_read(nxt_file_t *file, u_char *buf, size_t size, nxt_off_t offset) +nxt_file_read(nxt_file_t *file, char *buf, size_t size, nxt_off_t offset) { ssize_t n; @@ -163,7 +163,7 @@ void nxt_file_read_ahead(nxt_file_t *file, nxt_off_t offset, size_t size) { int ret; - u_char buf; + char buf; ret = fcntl(file->fd, F_READAHEAD, (int) size); @@ -225,7 +225,7 @@ void nxt_file_read_ahead(nxt_file_t *file, nxt_off_t offset, size_t size) { int ret; - u_char buf; + char buf; ret = fcntl(file->fd, F_RDAHEAD, 1); @@ -245,7 +245,7 @@ nxt_file_read_ahead(nxt_file_t *file, nxt_off_t offset, size_t size) void nxt_file_read_ahead(nxt_file_t *file, nxt_off_t offset, size_t size) { - u_char buf; + char buf; (void) nxt_file_read(file, &buf, 1, offset); } @@ -527,7 +527,7 @@ nxt_fd_blocking(nxt_task_t *task, nxt_fd_t fd) ssize_t -nxt_fd_write(nxt_fd_t fd, u_char *buf, size_t size) +nxt_fd_write(nxt_fd_t fd, char *buf, size_t size) { ssize_t n; nxt_err_t err; @@ -547,7 +547,7 @@ nxt_fd_write(nxt_fd_t fd, u_char *buf, size_t size) ssize_t -nxt_fd_read(nxt_fd_t fd, u_char *buf, size_t size) +nxt_fd_read(nxt_fd_t fd, char *buf, size_t size) { ssize_t n; nxt_err_t err; diff --git a/src/nxt_file.h b/src/nxt_file.h index 0c03a5f90..c430afaa1 100644 --- a/src/nxt_file.h +++ b/src/nxt_file.h @@ -18,7 +18,7 @@ typedef struct stat nxt_file_info_t; #define NXT_FILE_SYSTEM_NAME_UTF8 1 -typedef u_char nxt_file_name_t; +typedef char nxt_file_name_t; typedef struct { @@ -152,9 +152,9 @@ NXT_EXPORT nxt_int_t nxt_file_openat2(nxt_task_t *task, nxt_file_t *file, NXT_EXPORT void nxt_file_close(nxt_task_t *task, nxt_file_t *file); -NXT_EXPORT ssize_t nxt_file_write(nxt_file_t *file, const u_char *buf, +NXT_EXPORT ssize_t nxt_file_write(nxt_file_t *file, const char *buf, size_t size, nxt_off_t offset); -NXT_EXPORT ssize_t nxt_file_read(nxt_file_t *file, u_char *buf, size_t size, +NXT_EXPORT ssize_t nxt_file_read(nxt_file_t *file, char *buf, size_t size, nxt_off_t offset); NXT_EXPORT void nxt_file_read_ahead(nxt_file_t *file, nxt_off_t offset, size_t size); @@ -184,8 +184,8 @@ NXT_EXPORT nxt_int_t nxt_file_rename(nxt_file_name_t *old_name, NXT_EXPORT nxt_int_t nxt_fd_nonblocking(nxt_task_t *task, nxt_fd_t fd); NXT_EXPORT nxt_int_t nxt_fd_blocking(nxt_task_t *task, nxt_fd_t fd); -NXT_EXPORT ssize_t nxt_fd_write(nxt_fd_t fd, u_char *buf, size_t size); -NXT_EXPORT ssize_t nxt_fd_read(nxt_fd_t fd, u_char *buf, size_t size); +NXT_EXPORT ssize_t nxt_fd_write(nxt_fd_t fd, char *buf, size_t size); +NXT_EXPORT ssize_t nxt_fd_read(nxt_fd_t fd, char *buf, size_t size); NXT_EXPORT void nxt_fd_close(nxt_fd_t fd); NXT_EXPORT FILE *nxt_file_fopen(nxt_task_t *task, const char *pathname, diff --git a/src/nxt_file_name.c b/src/nxt_file_name.c index 935479ead..2fa60d96e 100644 --- a/src/nxt_file_name.c +++ b/src/nxt_file_name.c @@ -20,7 +20,7 @@ nxt_int_t nxt_file_name_create(nxt_mp_t *mp, nxt_file_name_str_t *file_name, const char *format, ...) { - u_char ch, *p; + char ch, *p; size_t length; va_list args; nxt_str_t *v; @@ -60,7 +60,7 @@ nxt_file_name_create(nxt_mp_t *mp, nxt_file_name_str_t *file_name, continue; case 's': - p = va_arg(args, u_char *); + p = va_arg(args, char *); if (nxt_fast_path(p != NULL)) { while (*p != '\0') { @@ -149,7 +149,7 @@ nxt_file_name_create(nxt_mp_t *mp, nxt_file_name_str_t *file_name, continue; case 's': - p = va_arg(args, u_char *); + p = va_arg(args, char *); if (nxt_fast_path(p != NULL)) { while (*p != '\0') { @@ -165,7 +165,7 @@ nxt_file_name_create(nxt_mp_t *mp, nxt_file_name_str_t *file_name, ch = *fmt++; if (nxt_fast_path(ch == 's')) { - p = va_arg(args, u_char *); + p = va_arg(args, char *); dst = nxt_file_name_add(dst, p, length); } diff --git a/src/nxt_fs.c b/src/nxt_fs.c index 8ea8e1867..924434463 100644 --- a/src/nxt_fs.c +++ b/src/nxt_fs.c @@ -6,11 +6,11 @@ #include -static nxt_int_t nxt_fs_mkdir(const u_char *dir, mode_t mode); +static nxt_int_t nxt_fs_mkdir(const char *dir, mode_t mode); nxt_int_t -nxt_fs_mkdir_p(const u_char *dir, mode_t mode) +nxt_fs_mkdir_p(const char *dir, mode_t mode) { char *start, *end, *dst; size_t dirlen; @@ -33,7 +33,7 @@ nxt_fs_mkdir_p(const u_char *dir, mode_t mode) dst = nxt_cpymem(dst, start, end - start); *dst = '\0'; - ret = nxt_fs_mkdir((u_char *) path, mode); + ret = nxt_fs_mkdir((char *) path, mode); if (nxt_slow_path(ret != NXT_OK && nxt_errno != EEXIST)) { return NXT_ERROR; } @@ -46,7 +46,7 @@ nxt_fs_mkdir_p(const u_char *dir, mode_t mode) nxt_int_t -nxt_fs_mkdir_p_dirname(const u_char *path, mode_t mode) +nxt_fs_mkdir_p_dirname(const char *path, mode_t mode) { char *ptr, *dir; nxt_int_t ret; @@ -64,7 +64,7 @@ nxt_fs_mkdir_p_dirname(const u_char *path, mode_t mode) } *ptr = '\0'; - ret = nxt_fs_mkdir_p((const u_char *) dir, mode); + ret = nxt_fs_mkdir_p((const char *) dir, mode); out_free: nxt_free(dir); @@ -74,7 +74,7 @@ nxt_fs_mkdir_p_dirname(const u_char *path, mode_t mode) static nxt_int_t -nxt_fs_mkdir(const u_char *dir, mode_t mode) +nxt_fs_mkdir(const char *dir, mode_t mode) { if (nxt_fast_path(mkdir((const char *) dir, mode) == 0)) { return NXT_OK; diff --git a/src/nxt_fs.h b/src/nxt_fs.h index a06e4d3d8..579906217 100644 --- a/src/nxt_fs.h +++ b/src/nxt_fs.h @@ -6,8 +6,8 @@ #define _NXT_FS_H_INCLUDED_ -nxt_int_t nxt_fs_mkdir_p_dirname(const u_char *path, mode_t mode); -nxt_int_t nxt_fs_mkdir_p(const u_char *dir, mode_t mode); +nxt_int_t nxt_fs_mkdir_p_dirname(const char *path, mode_t mode); +nxt_int_t nxt_fs_mkdir_p(const char *dir, mode_t mode); #endif /* _NXT_FS_H_INCLUDED_ */ diff --git a/src/nxt_fs_mount.c b/src/nxt_fs_mount.c index d9b384e43..749f7ac5d 100644 --- a/src/nxt_fs_mount.c +++ b/src/nxt_fs_mount.c @@ -81,7 +81,7 @@ nxt_int_t nxt_fs_mount(nxt_task_t *task, nxt_fs_mount_t *mnt) { int flags; - u_char *data, *p, *end; + char *data, *p, *end; size_t iovlen; nxt_int_t ret; const char *fsname; @@ -153,7 +153,7 @@ nxt_fs_mount(nxt_task_t *task, nxt_fs_mount_t *mnt) data = NULL; if (mnt->data != NULL) { - data = (u_char *) nxt_strdup(mnt->data); + data = (char *) nxt_strdup(mnt->data); if (nxt_slow_path(data == NULL)) { return NXT_ERROR; } @@ -209,7 +209,7 @@ nxt_fs_mount(nxt_task_t *task, nxt_fs_mount_t *mnt) #if (NXT_HAVE_LINUX_UMOUNT2) void -nxt_fs_unmount(const u_char *path) +nxt_fs_unmount(const char *path) { if (nxt_slow_path(umount2((const char *) path, MNT_DETACH) < 0)) { nxt_thread_log_error(NXT_LOG_WARN, "umount2(%s, MNT_DETACH) %E", @@ -220,7 +220,7 @@ nxt_fs_unmount(const u_char *path) #elif (NXT_HAVE_UNMOUNT) void -nxt_fs_unmount(const u_char *path) +nxt_fs_unmount(const char *path) { if (nxt_slow_path(unmount((const char *) path, MNT_FORCE) < 0)) { nxt_thread_log_error(NXT_LOG_WARN, "unmount(%s) %E", path, nxt_errno); diff --git a/src/nxt_fs_mount.h b/src/nxt_fs_mount.h index e0fe6eb2c..b3622e63a 100644 --- a/src/nxt_fs_mount.h +++ b/src/nxt_fs_mount.h @@ -30,19 +30,19 @@ enum nxt_fs_flags_s { struct nxt_fs_mount_s { - u_char *src; - u_char *dst; + char *src; + char *dst; nxt_fs_type_t type; - u_char *name; + char *name; nxt_fs_flags_t flags; - u_char *data; + char *data; nxt_uint_t builtin; /* 1-bit */ nxt_uint_t deps; /* 1-bit */ }; nxt_int_t nxt_fs_mount(nxt_task_t *task, nxt_fs_mount_t *mnt); -void nxt_fs_unmount(const u_char *path); +void nxt_fs_unmount(const char *path); #endif /* _NXT_FS_MOUNT_H_INCLUDED_ */ diff --git a/src/nxt_gnutls.c b/src/nxt_gnutls.c index aab4699c6..feafea6e5 100644 --- a/src/nxt_gnutls.c +++ b/src/nxt_gnutls.c @@ -379,7 +379,7 @@ nxt_gnutls_push(gnutls_transport_ptr_t data, const void *buf, size_t size) c = data; thr = nxt_thread(); - n = thr->engine->event->io->send(c, (u_char *) buf, size); + n = thr->engine->event->io->send(c, (char *) buf, size); if (n == NXT_AGAIN) { nxt_set_errno(NXT_EAGAIN); @@ -683,7 +683,7 @@ nxt_gnutls_conn_log_error(nxt_event_conn_t *c, ssize_t err, { va_list args; nxt_uint_t level; - u_char *p, msg[NXT_MAX_ERROR_STR]; + char *p, msg[NXT_MAX_ERROR_STR]; level = nxt_gnutls_log_error_level(c, err); @@ -731,7 +731,7 @@ nxt_gnutls_log_error(nxt_uint_t level, nxt_log_t *log, int err, const char *fmt, ...) { va_list args; - u_char *p, msg[NXT_MAX_ERROR_STR]; + char *p, msg[NXT_MAX_ERROR_STR]; va_start(args, fmt); p = nxt_vsprintf(msg, msg + sizeof(msg), fmt, args); diff --git a/src/nxt_h1proto.c b/src/nxt_h1proto.c index 5d1ed7904..c2bf2f5ec 100644 --- a/src/nxt_h1proto.c +++ b/src/nxt_h1proto.c @@ -310,7 +310,7 @@ nxt_http_idle_io_read_handler(nxt_task_t *task, nxt_conn_t *c) static void nxt_http_conn_test(nxt_task_t *task, void *obj, void *data) { - u_char *p; + char *p; nxt_buf_t *b; nxt_conn_t *c; nxt_tls_conf_t *tls; @@ -338,7 +338,7 @@ nxt_http_conn_test(nxt_task_t *task, void *obj, void *data) #if (NXT_DEBUG) if (nxt_buf_mem_used_size(&b->mem) >= 11) { - u_char major, minor; + char major, minor; const char *protocol; major = p[9]; @@ -650,7 +650,7 @@ static nxt_int_t nxt_h1p_header_process(nxt_task_t *task, nxt_h1proto_t *h1p, nxt_http_request_t *r) { - u_char *m; + char *m; nxt_int_t ret; r->target.start = h1p->parser.target_start; @@ -1306,7 +1306,7 @@ static void nxt_h1p_request_header_send(nxt_task_t *task, nxt_http_request_t *r, nxt_work_handler_t body_handler, void *data) { - u_char *p; + char *p; size_t size; nxt_buf_t *header; nxt_str_t unknown_status; @@ -1317,7 +1317,7 @@ nxt_h1p_request_header_send(nxt_task_t *task, nxt_http_request_t *r, nxt_h1proto_t *h1p; const nxt_str_t *status; nxt_http_field_t *field; - u_char buf[UNKNOWN_STATUS_LENGTH]; + char buf[UNKNOWN_STATUS_LENGTH]; static const char chunked[] = "Transfer-Encoding: chunked\r\n"; static const char websocket_version[] = "Sec-WebSocket-Version: 13\r\n"; @@ -2001,7 +2001,7 @@ nxt_h1p_idle_timeout(nxt_task_t *task, void *obj, void *data) static void nxt_h1p_idle_response(nxt_task_t *task, nxt_conn_t *c) { - u_char *p; + char *p; size_t size; nxt_buf_t *out, *last; @@ -2360,7 +2360,7 @@ nxt_h1p_peer_refused(nxt_task_t *task, void *obj, void *data) static void nxt_h1p_peer_header_send(nxt_task_t *task, nxt_http_peer_t *peer) { - u_char *p; + char *p; size_t size; nxt_int_t ret; nxt_str_t target; @@ -2469,7 +2469,7 @@ nxt_h1p_peer_header_send(nxt_task_t *task, nxt_http_peer_t *peer) static nxt_int_t nxt_h1p_peer_request_target(nxt_http_request_t *r, nxt_str_t *target) { - u_char *p; + char *p; size_t size, encode; if (!r->uri_changed) { @@ -2497,7 +2497,7 @@ nxt_h1p_peer_request_target(nxt_http_request_t *r, nxt_str_t *target) } if (r->quoted_target) { - p = (u_char *) nxt_encode_complex_uri(target->start, r->path->start, + p = (char *) nxt_encode_complex_uri(target->start, r->path->start, r->path->length); } else { @@ -2750,7 +2750,7 @@ nxt_h1p_peer_header_read_done(nxt_task_t *task, void *obj, void *data) static nxt_int_t nxt_h1p_peer_header_parse(nxt_http_peer_t *peer, nxt_buf_mem_t *bm) { - u_char *p; + char *p; size_t length; nxt_int_t status; diff --git a/src/nxt_h1proto_websocket.c b/src/nxt_h1proto_websocket.c index 7be190f6c..7d0c27aaf 100644 --- a/src/nxt_h1proto_websocket.c +++ b/src/nxt_h1proto_websocket.c @@ -578,12 +578,12 @@ static void hxt_h1p_send_ws_error(nxt_task_t *task, nxt_http_request_t *r, const nxt_ws_error_t *err, ...) { - u_char *p; + char *p; va_list args; nxt_buf_t *out; nxt_str_t desc; nxt_websocket_header_t *wsh; - u_char buf[125]; + char buf[125]; if (nxt_slow_path(err->args)) { va_start(args, err); diff --git a/src/nxt_http.h b/src/nxt_http.h index 5369c8e16..7297a4867 100644 --- a/src/nxt_http.h +++ b/src/nxt_http.h @@ -91,7 +91,7 @@ typedef union { #define nxt_http_field_name_set(_field, _name) \ do { \ (_field)->name_length = nxt_length(_name); \ - (_field)->name = (u_char *) _name; \ + (_field)->name = (char *) _name; \ } while (0) @@ -99,8 +99,8 @@ typedef union { do { \ (_field)->name_length = nxt_length(_name); \ (_field)->value_length = nxt_length(_value); \ - (_field)->name = (u_char *) _name; \ - (_field)->value = (u_char *) _value; \ + (_field)->name = (char *) _name; \ + (_field)->value = (char *) _value; \ } while (0) @@ -213,8 +213,8 @@ typedef struct { uint16_t hash; uint16_t name_length; uint32_t value_length; - u_char *name; - u_char *value; + char *name; + char *value; } nxt_http_name_value_t; @@ -304,8 +304,8 @@ struct nxt_http_forward_s { #define NXT_HTTP_DATE_LEN nxt_length("Wed, 31 Dec 1986 16:40:00 GMT") -nxt_inline u_char * -nxt_http_date(u_char *buf, struct tm *tm) +nxt_inline char * +nxt_http_date(char *buf, struct tm *tm) { static const char * const week[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" }; @@ -376,7 +376,7 @@ nxt_int_t nxt_http_route_addr_rule(nxt_http_request_t *r, nxt_http_route_rule_t *nxt_http_route_types_rule_create(nxt_task_t *task, nxt_mp_t *mp, nxt_conf_value_t *types); nxt_int_t nxt_http_route_test_rule(nxt_http_request_t *r, - nxt_http_route_rule_t *rule, u_char *start, size_t length); + nxt_http_route_rule_t *rule, char *start, size_t length); nxt_int_t nxt_http_action_init(nxt_task_t *task, nxt_router_temp_conf_t *tmcf, nxt_conf_value_t *cv, nxt_http_action_t *action); diff --git a/src/nxt_http_chunk_parse.c b/src/nxt_http_chunk_parse.c index a43ce75b8..dea83d5b8 100644 --- a/src/nxt_http_chunk_parse.c +++ b/src/nxt_http_chunk_parse.c @@ -28,7 +28,7 @@ nxt_buf_t * nxt_http_chunk_parse(nxt_task_t *task, nxt_http_chunk_parse_t *hcp, nxt_buf_t *in) { - u_char c, ch; + char c, ch; nxt_int_t ret; nxt_buf_t *b, *out, *next, **tail; enum { @@ -197,7 +197,7 @@ static nxt_int_t nxt_http_chunk_buffer(nxt_http_chunk_parse_t *hcp, nxt_buf_t ***tail, nxt_buf_t *in) { - u_char *p; + char *p; size_t size; nxt_buf_t *b; diff --git a/src/nxt_http_js.c b/src/nxt_http_js.c index 34689fba1..d7ea54da1 100644 --- a/src/nxt_http_js.c +++ b/src/nxt_http_js.c @@ -164,7 +164,7 @@ static njs_int_t nxt_http_js_ext_get_args(njs_vm_t *vm, njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval, njs_value_t *retval) { - u_char *start; + char *start; njs_int_t ret; njs_value_t *args; njs_opaque_value_t val; @@ -178,7 +178,7 @@ nxt_http_js_ext_get_args(njs_vm_t *vm, njs_object_prop_t *prop, args = njs_value_arg(&val); - start = (r->args->start != NULL) ? r->args->start : (u_char *) ""; + start = (r->args->start != NULL) ? r->args->start : (char *) ""; ret = njs_vm_query_string_parse(vm, start, start + r->args->length, args); if (ret == NJS_ERROR) { diff --git a/src/nxt_http_parse.c b/src/nxt_http_parse.c index dd490e729..28eda81e9 100644 --- a/src/nxt_http_parse.c +++ b/src/nxt_http_parse.c @@ -8,16 +8,16 @@ static nxt_int_t nxt_http_parse_unusual_target(nxt_http_request_parse_t *rp, - u_char **pos, const u_char *end); + char **pos, const char *end); static nxt_int_t nxt_http_parse_request_line(nxt_http_request_parse_t *rp, - u_char **pos, const u_char *end); + char **pos, const char *end); static nxt_int_t nxt_http_parse_field_name(nxt_http_request_parse_t *rp, - u_char **pos, const u_char *end); + char **pos, const char *end); static nxt_int_t nxt_http_parse_field_value(nxt_http_request_parse_t *rp, - u_char **pos, const u_char *end); -static u_char *nxt_http_lookup_field_end(u_char *p, const u_char *end); + char **pos, const char *end); +static char *nxt_http_lookup_field_end(char *p, const char *end); static nxt_int_t nxt_http_parse_field_end(nxt_http_request_parse_t *rp, - u_char **pos, const u_char *end); + char **pos, const char *end); static nxt_int_t nxt_http_field_hash_test(nxt_lvlhsh_query_t *lhq, void *data); @@ -60,9 +60,9 @@ static const uint8_t nxt_http_target_chars[256] nxt_aligned(64) = { nxt_inline nxt_http_target_traps_e -nxt_http_parse_target(u_char **pos, const u_char *end) +nxt_http_parse_target(char **pos, const char *end) { - u_char *p; + char *p; nxt_uint_t trap; p = *pos; @@ -155,10 +155,10 @@ nxt_http_parse_fields(nxt_http_request_parse_t *rp, nxt_buf_mem_t *b) static nxt_int_t -nxt_http_parse_request_line(nxt_http_request_parse_t *rp, u_char **pos, - const u_char *end) +nxt_http_parse_request_line(nxt_http_request_parse_t *rp, char **pos, + const char *end) { - u_char *p, ch, *after_slash, *args; + char *p, ch, *after_slash, *args; nxt_int_t rc; nxt_bool_t rest; nxt_http_ver_t ver; @@ -471,10 +471,10 @@ nxt_http_parse_request_line(nxt_http_request_parse_t *rp, u_char **pos, static nxt_int_t -nxt_http_parse_unusual_target(nxt_http_request_parse_t *rp, u_char **pos, - const u_char *end) +nxt_http_parse_unusual_target(nxt_http_request_parse_t *rp, char **pos, + const char *end) { - u_char *p, ch; + char *p, ch; p = *pos; @@ -509,14 +509,14 @@ nxt_http_parse_unusual_target(nxt_http_request_parse_t *rp, u_char **pos, static nxt_int_t -nxt_http_parse_field_name(nxt_http_request_parse_t *rp, u_char **pos, - const u_char *end) +nxt_http_parse_field_name(nxt_http_request_parse_t *rp, char **pos, + const char *end) { - u_char *p, c; + char *p, c; size_t len; uint32_t hash; - static const u_char normal[256] nxt_aligned(64) = + static const char normal[256] nxt_aligned(64) = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" /* \s ! " # $ % & ' ( ) * + , . / : ; < = > ? */ "\0\1\0\1\1\1\1\1\0\0\1\1\0" "-" "\1\0" "0123456789" "\0\0\0\0\0\0" @@ -616,10 +616,10 @@ nxt_http_parse_field_name(nxt_http_request_parse_t *rp, u_char **pos, static nxt_int_t -nxt_http_parse_field_value(nxt_http_request_parse_t *rp, u_char **pos, - const u_char *end) +nxt_http_parse_field_value(nxt_http_request_parse_t *rp, char **pos, + const char *end) { - u_char *p, *start, ch; + char *p, *start, ch; size_t len; p = *pos; @@ -696,8 +696,8 @@ nxt_http_parse_field_value(nxt_http_request_parse_t *rp, u_char **pos, } -static u_char * -nxt_http_lookup_field_end(u_char *p, const u_char *end) +static char * +nxt_http_lookup_field_end(char *p, const char *end) { while (nxt_fast_path(end - p >= 16)) { @@ -763,10 +763,10 @@ nxt_http_lookup_field_end(u_char *p, const u_char *end) static nxt_int_t -nxt_http_parse_field_end(nxt_http_request_parse_t *rp, u_char **pos, - const u_char *end) +nxt_http_parse_field_end(nxt_http_request_parse_t *rp, char **pos, + const char *end) { - u_char *p; + char *p; nxt_http_field_t *field; p = *pos; @@ -848,7 +848,7 @@ static const uint8_t nxt_http_normal[32] nxt_aligned(32) = { nxt_int_t nxt_http_parse_complex_target(nxt_http_request_parse_t *rp) { - u_char *p, *u, c, ch, high, *args; + char *p, *u, c, ch, high, *args; enum { sw_normal = 0, @@ -1173,7 +1173,7 @@ nxt_int_t nxt_http_fields_hash(nxt_lvlhsh_t *hash, nxt_http_field_proc_t items[], nxt_uint_t count) { - u_char ch; + char ch; uint32_t key; nxt_str_t *name; nxt_int_t ret; @@ -1212,7 +1212,7 @@ nxt_uint_t nxt_http_fields_hash_collisions(nxt_lvlhsh_t *hash, nxt_http_field_proc_t items[], nxt_uint_t count, nxt_bool_t level) { - u_char ch; + char ch; uint32_t key, mask; nxt_str_t *name; nxt_uint_t colls, i, j; diff --git a/src/nxt_http_parse.h b/src/nxt_http_parse.h index 9e2f6fabb..dfa7846a1 100644 --- a/src/nxt_http_parse.h +++ b/src/nxt_http_parse.h @@ -21,27 +21,27 @@ typedef struct nxt_http_fields_hash_s nxt_http_fields_hash_t; typedef union { - u_char str[8]; + char str[8]; uint64_t ui64; struct { - u_char prefix[5]; - u_char major; - u_char point; - u_char minor; + char prefix[5]; + char major; + char point; + char minor; } s; } nxt_http_ver_t; struct nxt_http_request_parse_s { nxt_int_t (*handler)(nxt_http_request_parse_t *rp, - u_char **pos, const u_char *end); + char **pos, const char *end); nxt_str_t method; - u_char *target_start; - u_char *target_end; - u_char *request_line_end; + char *target_start; + char *target_end; + char *request_line_end; nxt_str_t path; nxt_str_t args; @@ -90,8 +90,8 @@ struct nxt_http_field_s { uint8_t hopbyhop:1; uint8_t name_length; uint32_t value_length; - u_char *name; - u_char *value; + char *name; + char *value; }; diff --git a/src/nxt_http_request.c b/src/nxt_http_request.c index a7e9ff69a..f0e4d759e 100644 --- a/src/nxt_http_request.c +++ b/src/nxt_http_request.c @@ -15,7 +15,7 @@ static nxt_int_t nxt_http_request_forward(nxt_task_t *task, static void nxt_http_request_forward_client_ip(nxt_http_request_t *r, nxt_http_forward_t *forward, nxt_array_t *fields); static nxt_sockaddr_t *nxt_http_request_client_ip_sockaddr( - nxt_http_request_t *r, u_char *start, size_t len); + nxt_http_request_t *r, char *start, size_t len); static void nxt_http_request_forward_protocol(nxt_http_request_t *r, nxt_http_field_t *field); static void nxt_http_request_ready(nxt_task_t *task, void *obj, void *data); @@ -25,16 +25,16 @@ static void nxt_http_request_mem_buf_completion(nxt_task_t *task, void *obj, void *data); static void nxt_http_request_done(nxt_task_t *task, void *obj, void *data); -static u_char *nxt_http_date_cache_handler(u_char *buf, nxt_realtime_t *now, +static char *nxt_http_date_cache_handler(char *buf, nxt_realtime_t *now, struct tm *tm, size_t size, const char *format); static nxt_http_name_value_t *nxt_http_argument(nxt_array_t *array, - u_char *name, size_t name_length, uint32_t hash, u_char *start, - const u_char *end); -static nxt_int_t nxt_http_cookie_parse(nxt_array_t *cookies, u_char *start, - const u_char *end); -static nxt_http_name_value_t *nxt_http_cookie(nxt_array_t *array, u_char *name, - size_t name_length, u_char *start, const u_char *end); + char *name, size_t name_length, uint32_t hash, char *start, + const char *end); +static nxt_int_t nxt_http_cookie_parse(nxt_array_t *cookies, char *start, + const char *end); +static nxt_http_name_value_t *nxt_http_cookie(nxt_array_t *array, char *name, + size_t name_length, char *start, const char *end); #define NXT_HTTP_COOKIE_HASH \ @@ -106,7 +106,7 @@ nxt_http_request_host(void *ctx, nxt_http_field_t *field, uintptr_t data) static nxt_int_t nxt_http_validate_host(nxt_str_t *host, nxt_mp_t *mp) { - u_char *h, ch; + char *h, ch; size_t i, dot_pos, host_length; nxt_bool_t lowcase; @@ -412,7 +412,7 @@ static void nxt_http_request_forward_client_ip(nxt_http_request_t *r, nxt_http_forward_t *forward, nxt_array_t *fields) { - u_char *start, *p; + char *start, *p; nxt_int_t ret, i, len; nxt_sockaddr_t *sa, *prev_sa; nxt_http_field_t **f; @@ -469,7 +469,7 @@ nxt_http_request_forward_client_ip(nxt_http_request_t *r, static nxt_sockaddr_t * -nxt_http_request_client_ip_sockaddr(nxt_http_request_t *r, u_char *start, +nxt_http_request_client_ip_sockaddr(nxt_http_request_t *r, char *start, size_t len) { nxt_str_t addr; @@ -542,7 +542,7 @@ static nxt_int_t nxt_http_request_chunked_transform(nxt_http_request_t *r) { size_t size; - u_char *p, *end; + char *p, *end; nxt_http_field_t *f; r->chunked_field->skip = 1; @@ -672,7 +672,7 @@ void nxt_http_request_header_send(nxt_task_t *task, nxt_http_request_t *r, nxt_work_handler_t body_handler, void *data) { - u_char *p, *end, *server_string; + char *p, *end, *server_string; nxt_int_t ret; nxt_http_field_t *server, *date, *content_length; nxt_socket_conf_t *skcf; @@ -693,7 +693,7 @@ nxt_http_request_header_send(nxt_task_t *task, nxt_http_request_t *r, } skcf = r->conf->socket_conf; - server_string = (u_char *) (skcf->server_version ? NXT_SERVER : NXT_NAME); + server_string = (char *) (skcf->server_version ? NXT_SERVER : NXT_NAME); nxt_http_field_name_set(server, "Server"); server->value = server_string; @@ -911,8 +911,8 @@ nxt_http_request_close_handler(nxt_task_t *task, void *obj, void *data) } -static u_char * -nxt_http_date_cache_handler(u_char *buf, nxt_realtime_t *now, struct tm *tm, +static char * +nxt_http_date_cache_handler(char *buf, nxt_realtime_t *now, struct tm *tm, size_t size, const char *format) { return nxt_http_date(buf, tm); @@ -923,7 +923,7 @@ nxt_array_t * nxt_http_arguments_parse(nxt_http_request_t *r) { size_t name_length; - u_char *p, *dst, *dst_start, *start, *end, *name; + char *p, *dst, *dst_start, *start, *end, *name; uint8_t d0, d1; uint32_t hash; nxt_array_t *args; @@ -1031,8 +1031,8 @@ nxt_http_arguments_parse(nxt_http_request_t *r) static nxt_http_name_value_t * -nxt_http_argument(nxt_array_t *array, u_char *name, size_t name_length, - uint32_t hash, u_char *start, const u_char *end) +nxt_http_argument(nxt_array_t *array, char *name, size_t name_length, + uint32_t hash, char *start, const char *end) { size_t length; nxt_http_name_value_t *nv; @@ -1081,7 +1081,7 @@ nxt_http_cookies_parse(nxt_http_request_t *r) if (f->hash != NXT_HTTP_COOKIE_HASH || f->name_length != 6 - || nxt_strncasecmp(f->name, (u_char *) "Cookie", 6) != 0) + || nxt_strncasecmp(f->name, (char *) "Cookie", 6) != 0) { continue; } @@ -1101,10 +1101,10 @@ nxt_http_cookies_parse(nxt_http_request_t *r) static nxt_int_t -nxt_http_cookie_parse(nxt_array_t *cookies, u_char *start, const u_char *end) +nxt_http_cookie_parse(nxt_array_t *cookies, char *start, const char *end) { size_t name_length; - u_char c, *p, *name; + char c, *p, *name; nxt_http_name_value_t *nv; name = NULL; @@ -1146,10 +1146,10 @@ nxt_http_cookie_parse(nxt_array_t *cookies, u_char *start, const u_char *end) static nxt_http_name_value_t * -nxt_http_cookie(nxt_array_t *array, u_char *name, size_t name_length, - u_char *start, const u_char *end) +nxt_http_cookie(nxt_array_t *array, char *name, size_t name_length, + char *start, const char *end) { - u_char c, *p; + char c, *p; uint32_t hash; nxt_http_name_value_t *nv; @@ -1183,7 +1183,7 @@ int64_t nxt_http_field_hash(nxt_mp_t *mp, nxt_str_t *name, nxt_bool_t case_sensitive, uint8_t encoding) { - u_char c, *p, *src, *start, *end, plus; + char c, *p, *src, *start, *end, plus; uint8_t d0, d1; uint32_t hash; nxt_str_t str; @@ -1272,7 +1272,7 @@ nxt_http_argument_hash(nxt_mp_t *mp, nxt_str_t *name) int64_t nxt_http_header_hash(nxt_mp_t *mp, nxt_str_t *name) { - u_char c, *p; + char c, *p; uint32_t i, hash; nxt_str_t str; diff --git a/src/nxt_http_route.c b/src/nxt_http_route.c index bd0646f3b..c184a6561 100644 --- a/src/nxt_http_route.c +++ b/src/nxt_http_route.c @@ -56,7 +56,7 @@ typedef struct { typedef struct { - u_char *start; + char *start; uint32_t length; nxt_http_route_pattern_type_t type:8; } nxt_http_route_pattern_slice_t; @@ -84,8 +84,8 @@ typedef struct { uint16_t hash; uint16_t name_length; uint32_t value_length; - u_char *name; - u_char *value; + char *name; + char *value; } nxt_http_cookie_t; @@ -98,7 +98,7 @@ struct nxt_http_route_rule_s { uintptr_t offset; struct { - u_char *start; + char *start; uint16_t hash; uint16_t length; } name; @@ -227,8 +227,8 @@ static nxt_int_t nxt_http_route_cookies(nxt_http_request_t *r, static nxt_int_t nxt_http_route_test_cookie(nxt_http_request_t *r, nxt_http_route_rule_t *rule, nxt_array_t *array); static nxt_int_t nxt_http_route_pattern(nxt_http_request_t *r, - nxt_http_route_pattern_t *pattern, u_char *start, size_t length); -static nxt_int_t nxt_http_route_memcmp(u_char *start, u_char *test, + nxt_http_route_pattern_t *pattern, char *start, size_t length); +static nxt_int_t nxt_http_route_memcmp(char *start, char *test, size_t length, nxt_bool_t case_sensitive); @@ -983,7 +983,7 @@ nxt_http_route_pattern_create(nxt_task_t *task, nxt_mp_t *mp, nxt_http_route_pattern_case_t pattern_case, nxt_http_uri_encoding_t encoding) { - u_char c, *p, *end; + char c, *p, *end; nxt_str_t test, tmp; nxt_int_t ret; nxt_array_t *slices; @@ -1179,7 +1179,7 @@ nxt_http_route_pattern_create(nxt_task_t *task, nxt_mp_t *mp, static nxt_int_t nxt_http_route_decode_str(nxt_str_t *str, nxt_http_uri_encoding_t encoding) { - u_char *start, *end; + char *start, *end; switch (encoding) { case NXT_HTTP_URI_ENCODING_NONE: @@ -1221,7 +1221,7 @@ nxt_http_route_pattern_slice(nxt_array_t *slices, nxt_http_uri_encoding_t encoding, nxt_http_route_pattern_case_t pattern_case) { - u_char *start; + char *start; nxt_int_t ret; nxt_http_route_pattern_slice_t *slice; @@ -1453,7 +1453,7 @@ nxt_int_t nxt_http_pass_segments(nxt_mp_t *mp, nxt_str_t *pass, nxt_str_t *segments, nxt_uint_t n) { - u_char *p; + char *p; nxt_str_t rest; if (nxt_slow_path(nxt_str_dup(mp, &rest, pass) == NULL)) { @@ -1720,7 +1720,7 @@ static nxt_int_t nxt_http_route_rule(nxt_http_request_t *r, nxt_http_route_rule_t *rule) { void *p, **pp; - u_char *start; + char *start; size_t length; nxt_str_t *s; @@ -2105,7 +2105,7 @@ nxt_http_route_test_cookie(nxt_http_request_t *r, nxt_int_t nxt_http_route_test_rule(nxt_http_request_t *r, nxt_http_route_rule_t *rule, - u_char *start, size_t length) + char *start, size_t length) { nxt_int_t ret; nxt_http_route_pattern_t *pattern, *end; @@ -2136,9 +2136,9 @@ nxt_http_route_test_rule(nxt_http_request_t *r, nxt_http_route_rule_t *rule, static nxt_int_t nxt_http_route_pattern(nxt_http_request_t *r, nxt_http_route_pattern_t *pattern, - u_char *start, size_t length) + char *start, size_t length) { - u_char *p, *end, *test; + char *p, *end, *test; size_t test_length; uint32_t i; nxt_array_t *pattern_slices; @@ -2224,7 +2224,7 @@ nxt_http_route_pattern(nxt_http_request_t *r, nxt_http_route_pattern_t *pattern, static nxt_int_t -nxt_http_route_memcmp(u_char *start, u_char *test, size_t test_length, +nxt_http_route_memcmp(char *start, char *test, size_t test_length, nxt_bool_t case_sensitive) { nxt_int_t n; diff --git a/src/nxt_http_route_addr.c b/src/nxt_http_route_addr.c index 5a0d7679d..4707a11b9 100644 --- a/src/nxt_http_route_addr.c +++ b/src/nxt_http_route_addr.c @@ -9,7 +9,7 @@ #if (NXT_INET6) -static nxt_bool_t nxt_valid_ipv6_blocks(u_char *c, size_t len); +static nxt_bool_t nxt_valid_ipv6_blocks(char *c, size_t len); #endif @@ -17,7 +17,7 @@ nxt_int_t nxt_http_route_addr_pattern_parse(nxt_mp_t *mp, nxt_http_route_addr_pattern_t *pattern, nxt_conf_value_t *cv) { - u_char *delim; + char *delim; nxt_int_t ret, cidr_prefix; nxt_str_t addr, port; nxt_http_route_addr_base_t *base; @@ -68,7 +68,7 @@ nxt_http_route_addr_pattern_parse(nxt_mp_t *mp, if (nxt_inet6_probe(&addr)) { #if (NXT_INET6) - u_char *end; + char *end; uint8_t i; nxt_int_t len; nxt_http_route_in6_addr_range_t *inet6; @@ -316,9 +316,9 @@ nxt_http_route_addr_pattern_parse(nxt_mp_t *mp, #if (NXT_INET6) static nxt_bool_t -nxt_valid_ipv6_blocks(u_char *c, size_t len) +nxt_valid_ipv6_blocks(char *c, size_t len) { - u_char *end; + char *end; nxt_uint_t colon_gap; end = c + len; diff --git a/src/nxt_http_set_headers.c b/src/nxt_http_set_headers.c index 7fd6aba52..ea54c0cee 100644 --- a/src/nxt_http_set_headers.c +++ b/src/nxt_http_set_headers.c @@ -69,7 +69,7 @@ nxt_http_set_headers_init(nxt_router_conf_t *rtcf, nxt_http_action_t *action, static nxt_http_field_t * -nxt_http_resp_header_find(nxt_http_request_t *r, u_char *name, size_t length) +nxt_http_resp_header_find(nxt_http_request_t *r, char *name, size_t length) { nxt_http_field_t *f; diff --git a/src/nxt_http_static.c b/src/nxt_http_static.c index 67591595a..8e6cd366d 100644 --- a/src/nxt_http_static.c +++ b/src/nxt_http_static.c @@ -10,7 +10,7 @@ typedef struct { nxt_tstr_t *tstr; #if (NXT_HAVE_OPENAT2) - u_char *fname; + char *fname; #endif uint8_t is_const; /* 1 bit */ } nxt_http_static_share_t; @@ -52,7 +52,7 @@ static void nxt_http_static_send(nxt_task_t *task, nxt_http_request_t *r, static void nxt_http_static_next(nxt_task_t *task, nxt_http_request_t *r, nxt_http_static_ctx_t *ctx, nxt_http_status_t status); #if (NXT_HAVE_OPENAT2) -static u_char *nxt_http_static_chroot_match(u_char *chr, u_char *shr); +static char *nxt_http_static_chroot_match(char *chr, char *shr); #endif static void nxt_http_static_extract_extension(nxt_str_t *path, nxt_str_t *exten); @@ -311,7 +311,7 @@ nxt_http_static_send(nxt_task_t *task, nxt_http_request_t *r, nxt_http_static_ctx_t *ctx) { size_t length, encode; - u_char *p, *fname; + char *p, *fname; struct tm tm; nxt_buf_t *fb; nxt_int_t ret; @@ -407,11 +407,11 @@ nxt_http_static_send(nxt_task_t *task, nxt_http_request_t *r, } } else if (fname[0] == '/') { - file.name = (u_char *) "/"; + file.name = (char *) "/"; ret = nxt_file_open(task, &file, NXT_FILE_SEARCH, NXT_FILE_OPEN, 0); } else { - file.name = (u_char *) "."; + file.name = (char *) "."; file.fd = AT_FDCWD; ret = NXT_OK; } @@ -636,7 +636,7 @@ nxt_http_static_send(nxt_task_t *task, nxt_http_request_t *r, field->value_length = length; if (encode > 0) { - p = (u_char *) nxt_encode_uri(p, r->path->start, r->path->length); + p = (char *) nxt_encode_uri(p, r->path->start, r->path->length); } else { p = nxt_cpymem(p, r->path->start, r->path->length); @@ -700,8 +700,8 @@ nxt_http_static_next(nxt_task_t *task, nxt_http_request_t *r, #if (NXT_HAVE_OPENAT2) -static u_char * -nxt_http_static_chroot_match(u_char *chr, u_char *shr) +static char * +nxt_http_static_chroot_match(char *chr, char *shr) { if (*chr != *shr) { return NULL; @@ -758,7 +758,7 @@ nxt_http_static_chroot_match(u_char *chr, u_char *shr) static void nxt_http_static_extract_extension(nxt_str_t *path, nxt_str_t *exten) { - u_char ch, *p, *end; + char ch, *p, *end; end = path->start + path->length; p = end; @@ -995,7 +995,7 @@ nxt_http_static_mtypes_init(nxt_mp_t *mp, nxt_lvlhsh_t *hash) for (i = 0; i < nxt_nitems(default_types); i++) { type = (nxt_str_t *) &default_types[i].type; - exten.start = (u_char *) default_types[i].exten; + exten.start = (char *) default_types[i].exten; exten.length = nxt_strlen(exten.start); ret = nxt_http_static_mtypes_hash_add(mp, hash, &exten, type); diff --git a/src/nxt_http_variables.c b/src/nxt_http_variables.c index 3a1746b3a..b31a656aa 100644 --- a/src/nxt_http_variables.c +++ b/src/nxt_http_variables.c @@ -24,7 +24,7 @@ static nxt_int_t nxt_http_var_remote_addr(nxt_task_t *task, nxt_str_t *str, void *ctx, void *data); static nxt_int_t nxt_http_var_time_local(nxt_task_t *task, nxt_str_t *str, void *ctx, void *data); -static u_char *nxt_http_log_date(u_char *buf, nxt_realtime_t *now, +static char *nxt_http_log_date(char *buf, nxt_realtime_t *now, struct tm *tm, size_t size, const char *format); static nxt_int_t nxt_http_var_request_line(nxt_task_t *task, nxt_str_t *str, void *ctx, void *data); @@ -237,7 +237,7 @@ static nxt_int_t nxt_http_var_request_time(nxt_task_t *task, nxt_str_t *str, void *ctx, void *data) { - u_char *p; + char *p; nxt_msec_t ms; nxt_nsec_t now; nxt_http_request_t *r; @@ -359,11 +359,11 @@ nxt_http_var_time_local(nxt_task_t *task, nxt_str_t *str, void *ctx, void *data) } -static u_char * -nxt_http_log_date(u_char *buf, nxt_realtime_t *now, struct tm *tm, +static char * +nxt_http_log_date(char *buf, nxt_realtime_t *now, struct tm *tm, size_t size, const char *format) { - u_char sign; + char sign; time_t gmtoff; static const char * const month[] = { "Jan", "Feb", "Mar", "Apr", "May", @@ -431,7 +431,7 @@ static nxt_int_t nxt_http_var_body_bytes_sent(nxt_task_t *task, nxt_str_t *str, void *ctx, void *data) { - u_char *p; + char *p; nxt_off_t bytes; nxt_http_request_t *r; @@ -556,7 +556,7 @@ static nxt_int_t nxt_http_var_response_content_length(nxt_task_t *task, nxt_str_t *str, void *ctx, void *data) { - u_char *p; + char *p; nxt_http_request_t *r; r = ctx; @@ -721,7 +721,7 @@ static int nxt_http_field_name_cmp(nxt_str_t *name, nxt_http_field_t *field) { size_t i; - u_char c1, c2; + char c1, c2; if (name->length != field->name_length) { return 1; diff --git a/src/nxt_isolation.c b/src/nxt_isolation.c index 909a43f4b..b43029712 100644 --- a/src/nxt_isolation.c +++ b/src/nxt_isolation.c @@ -106,7 +106,7 @@ nxt_isolation_main_prefork(nxt_task_t *task, nxt_process_t *process, } } else { - if (!nxt_str_eq(&app_conf->user, (u_char *) rt->user_cred.user, + if (!nxt_str_eq(&app_conf->user, (char *) rt->user_cred.user, nxt_strlen(rt->user_cred.user))) { nxt_alert(task, "cannot set user \"%V\" for app \"%V\": " @@ -116,7 +116,7 @@ nxt_isolation_main_prefork(nxt_task_t *task, nxt_process_t *process, } if (app_conf->group.length > 0 - && !nxt_str_eq(&app_conf->group, (u_char *) rt->group, + && !nxt_str_eq(&app_conf->group, (char *) rt->group, nxt_strlen(rt->group))) { nxt_alert(task, "cannot set group \"%V\" for app \"%V\": " @@ -609,11 +609,11 @@ static nxt_int_t nxt_isolation_set_lang_mounts(nxt_task_t *task, nxt_process_t *process, nxt_array_t *lang_mounts) { - u_char *p; + char *p; size_t i, n, rootfs_len, len; nxt_mp_t *mp; nxt_array_t *mounts; - const u_char *rootfs; + const char *rootfs; nxt_fs_mount_t *mnt, *lang_mnt; mp = process->mem_pool; @@ -650,13 +650,13 @@ nxt_isolation_set_lang_mounts(nxt_task_t *task, nxt_process_t *process, return NXT_ERROR; } - mnt->src = (u_char *) "tmpfs"; - mnt->name = (u_char *) "tmpfs"; + mnt->src = (char *) "tmpfs"; + mnt->name = (char *) "tmpfs"; mnt->type = NXT_FS_TMP; mnt->flags = (NXT_FS_FLAGS_NOSUID | NXT_FS_FLAGS_NODEV | NXT_FS_FLAGS_NOEXEC); - mnt->data = (u_char *) "size=1m,mode=1777"; + mnt->data = (char *) "size=1m,mode=1777"; mnt->builtin = 1; mnt->deps = 0; @@ -676,9 +676,9 @@ nxt_isolation_set_lang_mounts(nxt_task_t *task, nxt_process_t *process, return NXT_ERROR; } - mnt->name = (u_char *) "proc"; + mnt->name = (char *) "proc"; mnt->type = NXT_FS_PROC; - mnt->src = (u_char *) "none"; + mnt->src = (char *) "none"; mnt->dst = nxt_mp_nget(mp, rootfs_len + nxt_length("/proc") + 1); if (nxt_slow_path(mnt->dst == NULL)) { return NXT_ERROR; @@ -688,7 +688,7 @@ nxt_isolation_set_lang_mounts(nxt_task_t *task, nxt_process_t *process, p = nxt_cpymem(p, "/proc", 5); *p = '\0'; - mnt->data = (u_char *) ""; + mnt->data = (char *) ""; mnt->flags = NXT_FS_FLAGS_NOEXEC | NXT_FS_FLAGS_NOSUID; mnt->builtin = 1; mnt->deps = 0; @@ -756,7 +756,7 @@ nxt_isolation_prepare_rootfs(nxt_task_t *task, nxt_process_t *process) nxt_int_t ret; struct stat st; nxt_array_t *mounts; - const u_char *dst; + const char *dst; nxt_fs_mount_t *mnt; nxt_process_automount_t *automount; @@ -897,7 +897,7 @@ nxt_isolation_make_private_mount(nxt_task_t *task, const char *rootfs) { char *parent_mnt; FILE *procfile; - u_char **mounts; + char **mounts; size_t len; uint8_t *shared; nxt_int_t ret, index, nmounts; @@ -941,7 +941,7 @@ nxt_isolation_make_private_mount(nxt_task_t *task, const char *rootfs) break; } - mounts[index] = (u_char *) strdup(ent->mnt_dir); + mounts[index] = (char *) strdup(ent->mnt_dir); shared[index] = hasmntopt(ent, "shared") != NULL; } diff --git a/src/nxt_js.c b/src/nxt_js.c index d46231bda..409ba92b3 100644 --- a/src/nxt_js.c +++ b/src/nxt_js.c @@ -117,7 +117,7 @@ nxt_js_set_proto(nxt_js_conf_t *jcf, njs_external_t *proto, njs_uint_t n) static njs_vm_t * nxt_js_vm_create(nxt_js_conf_t *jcf) { - u_char *p; + char *p; size_t size; njs_vm_t *vm; nxt_uint_t i; @@ -132,7 +132,7 @@ nxt_js_vm_create(nxt_js_conf_t *jcf) opts.backtrace = 1; - opts.file.start = (u_char *) "default"; + opts.file.start = (char *) "default"; opts.file.length = 7; if (jcf->test || jcf->modules->nelts == 0) { @@ -233,7 +233,7 @@ nxt_js_t * nxt_js_add_tpl(nxt_js_conf_t *jcf, nxt_str_t *str, nxt_bool_t strz) { size_t size; - u_char *p, *start; + char *p, *start; nxt_js_t *js; nxt_str_t *func; @@ -292,7 +292,7 @@ nxt_int_t nxt_js_compile(nxt_js_conf_t *jcf) { size_t size; - u_char *p, *start; + char *p, *start; njs_int_t ret; nxt_str_t *func; nxt_uint_t i; @@ -343,9 +343,9 @@ nxt_js_compile(nxt_js_conf_t *jcf) nxt_int_t -nxt_js_test(nxt_js_conf_t *jcf, nxt_str_t *str, u_char *error) +nxt_js_test(nxt_js_conf_t *jcf, nxt_str_t *str, char *error) { - u_char *start; + char *start; njs_vm_t *vm; njs_int_t ret; @@ -468,7 +468,7 @@ nxt_js_release(nxt_js_cache_t *cache) nxt_int_t -nxt_js_error(njs_vm_t *vm, u_char *error) +nxt_js_error(njs_vm_t *vm, char *error) { njs_int_t ret; njs_str_t res; diff --git a/src/nxt_js.h b/src/nxt_js.h index 48f036b82..5ee4a45a0 100644 --- a/src/nxt_js.h +++ b/src/nxt_js.h @@ -30,11 +30,11 @@ nxt_int_t nxt_js_add_module(nxt_js_conf_t *jcf, nxt_str_t *name, nxt_str_t *text); nxt_js_t *nxt_js_add_tpl(nxt_js_conf_t *jcf, nxt_str_t *str, nxt_bool_t strz); nxt_int_t nxt_js_compile(nxt_js_conf_t *jcf); -nxt_int_t nxt_js_test(nxt_js_conf_t *jcf, nxt_str_t *str, u_char *error); +nxt_int_t nxt_js_test(nxt_js_conf_t *jcf, nxt_str_t *str, char *error); nxt_int_t nxt_js_call(nxt_task_t *task, nxt_js_conf_t *jcf, nxt_js_cache_t *cache, nxt_js_t *js, nxt_str_t *str, void *ctx); void nxt_js_release(nxt_js_cache_t *cache); -nxt_int_t nxt_js_error(njs_vm_t *vm, u_char *error); +nxt_int_t nxt_js_error(njs_vm_t *vm, char *error); extern njs_int_t nxt_js_proto_id; diff --git a/src/nxt_listen_socket.c b/src/nxt_listen_socket.c index 4fe3e20b6..14f36fcfd 100644 --- a/src/nxt_listen_socket.c +++ b/src/nxt_listen_socket.c @@ -7,8 +7,8 @@ #include -static u_char *nxt_listen_socket_log_handler(void *ctx, u_char *pos, - u_char *last); +static char *nxt_listen_socket_log_handler(void *ctx, char *pos, + char *last); nxt_int_t @@ -37,7 +37,7 @@ nxt_listen_socket_create(nxt_task_t *task, nxt_mp_t *mp, nxt_sockaddr_t *sa; #if (NXT_HAVE_UNIX_DOMAIN) int ret; - u_char *p; + char *p; nxt_err_t err; nxt_socket_t ts; nxt_sockaddr_t *orig_sa; @@ -106,8 +106,8 @@ nxt_listen_socket_create(nxt_task_t *task, nxt_mp_t *mp, sa->type = SOCK_STREAM; sa->u.sockaddr_un.sun_family = AF_UNIX; - p = nxt_cpystr((u_char *) sa->u.sockaddr_un.sun_path, - (u_char *) orig_sa->u.sockaddr_un.sun_path); + p = nxt_cpystr((char *) sa->u.sockaddr_un.sun_path, + (char *) orig_sa->u.sockaddr_un.sun_path); nxt_memcpy(p, ".tmp", 4); nxt_sockaddr_text(sa); @@ -382,8 +382,8 @@ nxt_listen_socket_pool_min_size(nxt_listen_socket_t *ls) } -static u_char * -nxt_listen_socket_log_handler(void *ctx, u_char *pos, u_char *end) +static char * +nxt_listen_socket_log_handler(void *ctx, char *pos, char *end) { nxt_sockaddr_t *sa; diff --git a/src/nxt_log.c b/src/nxt_log.c index 587568164..d26d7a7c7 100644 --- a/src/nxt_log.c +++ b/src/nxt_log.c @@ -30,14 +30,14 @@ nxt_str_t nxt_log_levels[6] = { }; -static const u_char *nxt_log_prefix; +static const char *nxt_log_prefix; void nxt_log_start(const char *prefix) { if (prefix != NULL && *prefix != '\0') { - nxt_log_prefix = (u_char *) prefix; + nxt_log_prefix = (char *) prefix; } } @@ -66,12 +66,12 @@ nxt_log_set_ctx(nxt_log_t *log, nxt_log_ctx_handler_t handler, void *ctx) void nxt_cdecl nxt_log_handler(nxt_uint_t level, nxt_log_t *log, const char *fmt, ...) { - u_char *p, *end; + char *p, *end; #if 0 - u_char *syslogmsg; + char *syslogmsg; #endif va_list args; - u_char msg[NXT_MAX_ERROR_STR]; + char msg[NXT_MAX_ERROR_STR]; p = msg; end = msg + NXT_MAX_ERROR_STR; diff --git a/src/nxt_log.h b/src/nxt_log.h index aa2fe673e..d98f6dadf 100644 --- a/src/nxt_log.h +++ b/src/nxt_log.h @@ -21,7 +21,7 @@ typedef void nxt_cdecl (*nxt_log_handler_t)(nxt_uint_t level, nxt_log_t *log, const char *fmt, ...); -typedef u_char *(*nxt_log_ctx_handler_t)(void *ctx, u_char *pos, u_char *end); +typedef char *(*nxt_log_ctx_handler_t)(void *ctx, char *pos, char *end); struct nxt_log_s { diff --git a/src/nxt_main_process.c b/src/nxt_main_process.c index 00318226b..2a255e046 100644 --- a/src/nxt_main_process.c +++ b/src/nxt_main_process.c @@ -24,8 +24,8 @@ typedef struct { nxt_socket_t socket; nxt_socket_error_t error; - u_char *start; - u_char *end; + char *start; + char *end; } nxt_listening_socket_t; @@ -63,7 +63,7 @@ static void nxt_main_process_whoami_handler(nxt_task_t *task, static void nxt_main_port_conf_store_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg); static nxt_int_t nxt_main_file_store(nxt_task_t *task, const char *tmp_name, - const char *name, u_char *buf, size_t size); + const char *name, char *buf, size_t size); static void nxt_main_port_access_log_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg); @@ -440,7 +440,7 @@ nxt_main_new_port_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg) static void nxt_main_start_process_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg) { - u_char *start, *p, ch; + char *start, *p, ch; size_t type_len; nxt_int_t ret; nxt_buf_t *b; @@ -514,7 +514,7 @@ nxt_main_start_process_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg) goto failed; } - p = (u_char *) process->name; + p = (char *) process->name; *p++ = '"'; p = nxt_cpymem(p, init->name, app_conf->name.length); p = nxt_cpymem(p, "\" prototype", 11); @@ -809,9 +809,9 @@ nxt_main_process_port_create(nxt_task_t *task, nxt_runtime_t *rt) static void nxt_main_process_title(nxt_task_t *task) { - u_char *p, *end; + char *p, *end; nxt_uint_t i; - u_char title[2048]; + char title[2048]; end = title + sizeof(title) - 1; @@ -1116,7 +1116,7 @@ nxt_main_port_socket_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg) nxt_sockaddr_t *sa; nxt_port_msg_type_t type; nxt_listening_socket_t ls; - u_char message[2048]; + char message[2048]; port = nxt_runtime_port_find(task->thread->runtime, msg->port_msg.pid, msg->port_msg.reply_port); @@ -1592,7 +1592,7 @@ nxt_main_port_conf_store_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg) nxt_int_t ret; nxt_port_t *ctl_port; nxt_runtime_t *rt; - u_char ver[NXT_INT_T_LEN]; + char ver[NXT_INT_T_LEN]; rt = task->thread->runtime; @@ -1671,7 +1671,7 @@ nxt_main_port_conf_store_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg) static nxt_int_t nxt_main_file_store(nxt_task_t *task, const char *tmp_name, const char *name, - u_char *buf, size_t size) + char *buf, size_t size) { ssize_t n; nxt_int_t ret; @@ -1703,7 +1703,7 @@ nxt_main_file_store(nxt_task_t *task, const char *tmp_name, const char *name, static void nxt_main_port_access_log_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg) { - u_char *path; + char *path; nxt_int_t ret; nxt_file_t file; nxt_port_t *port; diff --git a/src/nxt_malloc.c b/src/nxt_malloc.c index 5ea7322f6..f9b89e1c2 100644 --- a/src/nxt_malloc.c +++ b/src/nxt_malloc.c @@ -181,7 +181,7 @@ void * nxt_memalign(size_t alignment, size_t size) { size_t aligned_size; - u_char *p; + char *p; nxt_err_t err; if (nxt_slow_path((alignment - 1) & alignment) != 0) { diff --git a/src/nxt_mem_zone.c b/src/nxt_mem_zone.c index a3ba37007..fee331312 100644 --- a/src/nxt_mem_zone.c +++ b/src/nxt_mem_zone.c @@ -80,8 +80,8 @@ struct nxt_mem_zone_s { uint32_t max_chunk_size; uint32_t small_bitmap_min_size; - u_char *start; - u_char *end; + char *start; + char *end; nxt_mem_zone_slot_t slots[]; }; @@ -92,7 +92,7 @@ struct nxt_mem_zone_s { #define nxt_mem_zone_addr_page(zone, addr) \ - &zone->pages[((u_char *) addr - zone->start) >> zone->page_size_shift] + &zone->pages[((char *) addr - zone->start) >> zone->page_size_shift] #define nxt_mem_zone_page_is_free(page) \ @@ -123,7 +123,7 @@ struct nxt_mem_zone_s { nxt_memset((p), 0x5A, size) -static uint32_t nxt_mem_zone_pages(u_char *start, size_t zone_size, +static uint32_t nxt_mem_zone_pages(char *start, size_t zone_size, nxt_uint_t page_size); static void *nxt_mem_zone_slots_init(nxt_mem_zone_t *zone, nxt_uint_t page_size); @@ -155,7 +155,7 @@ static nxt_log_moderation_t nxt_mem_zone_log_moderation = { nxt_mem_zone_t * -nxt_mem_zone_init(u_char *start, size_t zone_size, nxt_uint_t page_size) +nxt_mem_zone_init(char *start, size_t zone_size, nxt_uint_t page_size) { uint32_t pages; nxt_uint_t n; @@ -207,9 +207,9 @@ nxt_mem_zone_init(u_char *start, size_t zone_size, nxt_uint_t page_size) static uint32_t -nxt_mem_zone_pages(u_char *start, size_t zone_size, nxt_uint_t page_size) +nxt_mem_zone_pages(char *start, size_t zone_size, nxt_uint_t page_size) { - u_char *end; + char *end; size_t reserved; nxt_uint_t n, pages, size, chunks, last; nxt_mem_zone_t *zone; @@ -385,7 +385,7 @@ nxt_next_highest_power_of_two(uint32_t n) static intptr_t nxt_mem_zone_rbtree_compare(nxt_rbtree_node_t *node1, nxt_rbtree_node_t *node2) { - u_char *start1, *end1, *start2, *end2; + char *start1, *end1, *start2, *end2; uint32_t n, size, size1, size2; nxt_mem_zone_free_block_t *block1, *block2; @@ -416,10 +416,10 @@ nxt_mem_zone_rbtree_compare(nxt_rbtree_node_t *node1, nxt_rbtree_node_t *node2) /* Align the blocks' start and end to the rounded size. */ start1 = nxt_align_ptr(block1, size); - end1 = nxt_trunc_ptr((u_char *) block1 + size1, size); + end1 = nxt_trunc_ptr((char *) block1 + size1, size); start2 = nxt_align_ptr(block2, size); - end2 = nxt_trunc_ptr((u_char *) block2 + size2, size); + end2 = nxt_trunc_ptr((char *) block2 + size2, size); return (end1 - start1) - (end2 - start2); } @@ -507,7 +507,7 @@ static void * nxt_mem_zone_alloc_small(nxt_mem_zone_t *zone, nxt_mem_zone_slot_t *slot, size_t size) { - u_char *p; + char *p; uint8_t *map; nxt_mem_zone_page_t *page; @@ -647,7 +647,7 @@ nxt_mem_zone_alloc_large(nxt_mem_zone_t *zone, size_t alignment, size_t size) static nxt_mem_zone_page_t * nxt_mem_zone_alloc_pages(nxt_mem_zone_t *zone, size_t alignment, uint32_t pages) { - u_char *p; + char *p; size_t prev_size; uint32_t prev_pages, node_pages, next_pages; nxt_uint_t n; @@ -669,7 +669,7 @@ nxt_mem_zone_alloc_pages(nxt_mem_zone_t *zone, size_t alignment, uint32_t pages) p = nxt_align_ptr(block, alignment); page = nxt_mem_zone_addr_page(zone, p); - prev_size = p - (u_char *) block; + prev_size = p - (char *) block; if (prev_size != 0) { prev_pages = prev_size >> zone->page_size_shift; @@ -727,7 +727,7 @@ static nxt_mem_zone_free_block_t * nxt_mem_zone_find_free_block(nxt_mem_zone_t *zone, nxt_rbtree_node_t *node, uint32_t alignment, uint32_t pages) { - u_char *aligned, *end; + char *aligned, *end; nxt_mem_zone_free_block_t *block, *free_block; if (node == nxt_rbtree_sentinel(&zone->free_pages)) { @@ -747,7 +747,7 @@ nxt_mem_zone_find_free_block(nxt_mem_zone_t *zone, nxt_rbtree_node_t *node, aligned = nxt_align_ptr(block, alignment); if (pages == block->size) { - if (aligned == (u_char *) block) { + if (aligned == (char *) block) { /* Exact match. */ return block; } @@ -776,8 +776,8 @@ nxt_mem_zone_free(nxt_mem_zone_t *zone, void *p) nxt_thread_log_debug("mem zone free: %p", p); - if (nxt_fast_path(zone->start <= (u_char *) p - && (u_char *) p < zone->end)) + if (nxt_fast_path(zone->start <= (char *) p + && (char *) p < zone->end)) { page = nxt_mem_zone_addr_page(zone, p); @@ -822,7 +822,7 @@ static const char * nxt_mem_zone_free_chunk(nxt_mem_zone_t *zone, nxt_mem_zone_page_t *page, void *p) { - u_char *map; + char *map; uint32_t size, offset, chunk; nxt_mem_zone_page_t *pg, **ppg; nxt_mem_zone_slot_t *slot; @@ -843,7 +843,7 @@ nxt_mem_zone_free_chunk(nxt_mem_zone_t *zone, nxt_mem_zone_page_t *page, if (nxt_mem_zone_page_bitmap(zone, slot)) { /* A page's chunks bitmap is placed at the start of the page. */ - map = (u_char *) ((uintptr_t) p & ~((uintptr_t) zone->page_size_mask)); + map = (char *) ((uintptr_t) p & ~((uintptr_t) zone->page_size_mask)); } else { map = page->u.map; diff --git a/src/nxt_mem_zone.h b/src/nxt_mem_zone.h index 89d73ca22..35de7a985 100644 --- a/src/nxt_mem_zone.h +++ b/src/nxt_mem_zone.h @@ -11,7 +11,7 @@ typedef struct nxt_mem_zone_s nxt_mem_zone_t; -NXT_EXPORT nxt_mem_zone_t *nxt_mem_zone_init(u_char *start, size_t zone_size, +NXT_EXPORT nxt_mem_zone_t *nxt_mem_zone_init(char *start, size_t zone_size, nxt_uint_t page_size); #define nxt_mem_zone_alloc(zone, size) \ diff --git a/src/nxt_mp.c b/src/nxt_mp.c index 2bd8cdee4..22f5351a8 100644 --- a/src/nxt_mp.c +++ b/src/nxt_mp.c @@ -94,7 +94,7 @@ typedef struct { /* Block size must be less than 4G. */ uint32_t size; - u_char *start; + char *start; nxt_mp_page_t pages[]; } nxt_mp_block_t; @@ -155,9 +155,9 @@ static void *nxt_mp_alloc_large(nxt_mp_t *mp, size_t alignment, size_t size, nxt_bool_t freeable); static intptr_t nxt_mp_rbtree_compare(nxt_rbtree_node_t *node1, nxt_rbtree_node_t *node2); -static nxt_mp_block_t *nxt_mp_find_block(nxt_rbtree_t *tree, const u_char *p); +static nxt_mp_block_t *nxt_mp_find_block(nxt_rbtree_t *tree, const char *p); static const char *nxt_mp_chunk_free(nxt_mp_t *mp, nxt_mp_block_t *cluster, - u_char *p); + char *p); #if (NXT_HAVE_BUILTIN_CLZ) @@ -501,7 +501,7 @@ nxt_mp_chunk_pages_index(nxt_mp_t *mp, size_t size) #if !(NXT_DEBUG_MEMORY) -nxt_inline u_char * +nxt_inline char * nxt_mp_page_addr(nxt_mp_t *mp, nxt_mp_page_t *page) { size_t page_offset; @@ -510,7 +510,7 @@ nxt_mp_page_addr(nxt_mp_t *mp, nxt_mp_page_t *page) page_offset = page->number * sizeof(nxt_mp_page_t) + offsetof(nxt_mp_block_t, pages); - block = (nxt_mp_block_t *) ((u_char *) page - page_offset); + block = (nxt_mp_block_t *) ((char *) page - page_offset); return block->start + (page->number << mp->page_size_shift); } @@ -519,7 +519,7 @@ nxt_mp_page_addr(nxt_mp_t *mp, nxt_mp_page_t *page) static void * nxt_mp_alloc_small(nxt_mp_t *mp, size_t size) { - u_char *p; + char *p; nxt_uint_t n, index; nxt_queue_t *chunk_pages; nxt_mp_page_t *page; @@ -594,7 +594,7 @@ nxt_mp_alloc_small(nxt_mp_t *mp, size_t size) static void * nxt_mp_get_small(nxt_mp_t *mp, nxt_queue_t *pages, size_t size) { - u_char *p; + char *p; uint32_t available; nxt_mp_page_t *page; nxt_queue_link_t *link, *next; @@ -711,7 +711,7 @@ static void * nxt_mp_alloc_large(nxt_mp_t *mp, size_t alignment, size_t size, nxt_bool_t freeable) { - u_char *p; + char *p; size_t aligned_size; uint8_t type; nxt_mp_block_t *block; @@ -830,7 +830,7 @@ nxt_mp_free(nxt_mp_t *mp, void *p) static nxt_mp_block_t * -nxt_mp_find_block(nxt_rbtree_t *tree, const u_char *p) +nxt_mp_find_block(nxt_rbtree_t *tree, const char *p) { nxt_mp_block_t *block; nxt_rbtree_node_t *node, *sentinel; @@ -858,9 +858,9 @@ nxt_mp_find_block(nxt_rbtree_t *tree, const u_char *p) static const char * -nxt_mp_chunk_free(nxt_mp_t *mp, nxt_mp_block_t *cluster, u_char *p) +nxt_mp_chunk_free(nxt_mp_t *mp, nxt_mp_block_t *cluster, char *p) { - u_char *start; + char *start; uintptr_t offset; nxt_uint_t n, size, chunk; nxt_queue_t *chunk_pages; diff --git a/src/nxt_murmur_hash.c b/src/nxt_murmur_hash.c index 56bf2d4b6..4cd285393 100644 --- a/src/nxt_murmur_hash.c +++ b/src/nxt_murmur_hash.c @@ -11,7 +11,7 @@ uint32_t nxt_murmur_hash2(const void *data, size_t len) { uint32_t h, k; - const u_char *p; + const char *p; const uint32_t m = 0x5BD1E995; p = data; @@ -60,7 +60,7 @@ uint32_t nxt_murmur_hash2_uint32(const void *data) { uint32_t h, k; - const u_char *p; + const char *p; const uint32_t m = 0x5BD1E995; p = data; diff --git a/src/nxt_openssl.c b/src/nxt_openssl.c index 8f66f45b3..b69e6a7bb 100644 --- a/src/nxt_openssl.c +++ b/src/nxt_openssl.c @@ -32,9 +32,9 @@ typedef struct { struct nxt_tls_ticket_s { - u_char name[16]; - u_char hmac_key[32]; - u_char aes_key[32]; + char name[16]; + char hmac_key[32]; + char aes_key[32]; uint8_t size; }; @@ -636,7 +636,7 @@ nxt_tls_ticket_keys(nxt_task_t *task, SSL_CTX *ctx, nxt_tls_init_t *tls_init, nxt_conf_value_t *member, *tickets_conf; nxt_tls_ticket_t *ticket; nxt_tls_tickets_t *tickets; - u_char buf[80]; + char buf[80]; tickets_conf = tls_init->tickets_conf; @@ -874,7 +874,7 @@ nxt_openssl_cert_get_names(nxt_task_t *task, X509 *cert, nxt_tls_conf_t *conf, str.length = ASN1_STRING_length(name->d.dNSName); #if OPENSSL_VERSION_NUMBER > 0x10100000L - str.start = (u_char *) ASN1_STRING_get0_data(name->d.dNSName); + str.start = (char *) ASN1_STRING_get0_data(name->d.dNSName); #else str.start = ASN1_STRING_data(name->d.dNSName); #endif @@ -1070,7 +1070,7 @@ nxt_openssl_servername(SSL *s, int *ad, void *arg) return SSL_TLSEXT_ERR_ALERT_FATAL; } - nxt_memcpy_lowcase(str.start, (const u_char *) servername, str.length); + nxt_memcpy_lowcase(str.start, (const char *) servername, str.length); tls = c->u.tls; conf = tls->conf; @@ -1626,10 +1626,10 @@ nxt_openssl_conn_io_shutdown_timeout(nxt_task_t *task, void *obj, void *data) static void nxt_cdecl nxt_openssl_conn_error(nxt_task_t *task, nxt_err_t err, const char *fmt, ...) { - u_char *p, *end; + char *p, *end; va_list args; nxt_uint_t level; - u_char msg[NXT_MAX_ERROR_STR]; + char msg[NXT_MAX_ERROR_STR]; level = nxt_openssl_log_error_level(err); @@ -1735,9 +1735,9 @@ nxt_openssl_log_error_level(nxt_err_t err) void nxt_cdecl nxt_openssl_log_error(nxt_task_t *task, nxt_uint_t level, const char *fmt, ...) { - u_char *p, *end; + char *p, *end; va_list args; - u_char msg[NXT_MAX_ERROR_STR]; + char msg[NXT_MAX_ERROR_STR]; end = msg + sizeof(msg); @@ -1751,8 +1751,8 @@ nxt_openssl_log_error(nxt_task_t *task, nxt_uint_t level, const char *fmt, ...) } -u_char * -nxt_openssl_copy_error(u_char *p, u_char *end) +char * +nxt_openssl_copy_error(char *p, char *end) { int flags; u_long err; diff --git a/src/nxt_parse.c b/src/nxt_parse.c index e60bab4c4..6b3f0c4bc 100644 --- a/src/nxt_parse.c +++ b/src/nxt_parse.c @@ -13,9 +13,9 @@ */ nxt_int_t -nxt_int_parse(const u_char *p, size_t length) +nxt_int_parse(const char *p, size_t length) { - u_char c; + char c; nxt_uint_t val; static const nxt_uint_t cutoff = NXT_INT_T_MAX / 10; @@ -59,9 +59,9 @@ nxt_int_parse(const u_char *p, size_t length) */ ssize_t -nxt_size_t_parse(const u_char *p, size_t length) +nxt_size_t_parse(const char *p, size_t length) { - u_char c; + char c; size_t val; static const size_t cutoff = NXT_SIZE_T_MAX / 10; @@ -105,9 +105,9 @@ nxt_size_t_parse(const u_char *p, size_t length) */ ssize_t -nxt_size_parse(const u_char *p, size_t length) +nxt_size_parse(const char *p, size_t length) { - u_char unit; + char unit; ssize_t val, max; nxt_uint_t shift; @@ -164,9 +164,9 @@ nxt_size_parse(const u_char *p, size_t length) */ nxt_off_t -nxt_off_t_parse(const u_char *p, size_t length) +nxt_off_t_parse(const char *p, size_t length) { - u_char c; + char c; nxt_uoff_t val; static const nxt_uoff_t cutoff = NXT_OFF_T_MAX / 10; @@ -212,7 +212,7 @@ nxt_off_t_parse(const u_char *p, size_t length) nxt_int_t nxt_str_int_parse(nxt_str_t *s) { - u_char c, *p; + char c, *p; size_t length; nxt_uint_t val; @@ -263,12 +263,12 @@ nxt_str_int_parse(nxt_str_t *s) */ double -nxt_number_parse(const u_char **start, const u_char *end) +nxt_number_parse(const char **start, const char *end) { - u_char c; + char c; nxt_bool_t overflow; nxt_uint_t integral, frac, power; - const u_char *p; + const char *p; static const nxt_uint_t cutoff = NXT_INT_T_MAX / 10; static const nxt_uint_t cutlim = NXT_INT_T_MAX % 10; diff --git a/src/nxt_parse.h b/src/nxt_parse.h index 0643af1ed..b1ed3b9d3 100644 --- a/src/nxt_parse.h +++ b/src/nxt_parse.h @@ -8,17 +8,17 @@ #define _NXT_PARSE_H_INCLUDED_ -NXT_EXPORT nxt_int_t nxt_int_parse(const u_char *p, size_t len); -NXT_EXPORT ssize_t nxt_size_t_parse(const u_char *p, size_t len); -NXT_EXPORT ssize_t nxt_size_parse(const u_char *p, size_t len); -NXT_EXPORT nxt_off_t nxt_off_t_parse(const u_char *p, size_t len); +NXT_EXPORT nxt_int_t nxt_int_parse(const char *p, size_t len); +NXT_EXPORT ssize_t nxt_size_t_parse(const char *p, size_t len); +NXT_EXPORT ssize_t nxt_size_parse(const char *p, size_t len); +NXT_EXPORT nxt_off_t nxt_off_t_parse(const char *p, size_t len); NXT_EXPORT nxt_int_t nxt_str_int_parse(nxt_str_t *s); -NXT_EXPORT double nxt_number_parse(const u_char **start, const u_char *end); +NXT_EXPORT double nxt_number_parse(const char **start, const char *end); -NXT_EXPORT nxt_time_t nxt_time_parse(const u_char *p, size_t len); -NXT_EXPORT nxt_int_t nxt_term_parse(const u_char *p, size_t len, +NXT_EXPORT nxt_time_t nxt_time_parse(const char *p, size_t len); +NXT_EXPORT nxt_int_t nxt_term_parse(const char *p, size_t len, nxt_bool_t seconds); diff --git a/src/nxt_pcre.c b/src/nxt_pcre.c index 737fc7cf7..f3b08d82c 100644 --- a/src/nxt_pcre.c +++ b/src/nxt_pcre.c @@ -48,7 +48,7 @@ nxt_regex_compile(nxt_mp_t *mp, nxt_str_t *source, nxt_regex_err_t *err) pattern[source->length] = '\0'; re->pattern.length = source->length; - re->pattern.start = (u_char *) pattern; + re->pattern.start = (char *) pattern; saved_malloc = pcre_malloc; saved_free = pcre_free; @@ -116,7 +116,7 @@ nxt_regex_match_create(nxt_mp_t *mp, size_t size) nxt_int_t -nxt_regex_match(nxt_regex_t *re, u_char *subject, size_t length, +nxt_regex_match(nxt_regex_t *re, char *subject, size_t length, nxt_regex_match_t *match) { int ret; diff --git a/src/nxt_pcre2.c b/src/nxt_pcre2.c index cb51062c0..77a08580d 100644 --- a/src/nxt_pcre2.c +++ b/src/nxt_pcre2.c @@ -30,7 +30,7 @@ nxt_regex_compile(nxt_mp_t *mp, nxt_str_t *source, nxt_regex_err_t *err) pcre2_general_context *general_ctx; pcre2_compile_context *compile_ctx; - static const u_char alloc_error[] = "memory allocation failed"; + static const char alloc_error[] = "memory allocation failed"; general_ctx = pcre2_general_context_create(nxt_pcre2_malloc, nxt_pcre2_free, mp); @@ -130,7 +130,7 @@ nxt_regex_match_create(nxt_mp_t *mp, size_t size) nxt_int_t -nxt_regex_match(nxt_regex_t *re, u_char *subject, size_t length, +nxt_regex_match(nxt_regex_t *re, char *subject, size_t length, nxt_regex_match_t *match) { nxt_int_t ret; diff --git a/src/nxt_php_sapi.c b/src/nxt_php_sapi.c index da667b660..e0b9d11b0 100644 --- a/src/nxt_php_sapi.c +++ b/src/nxt_php_sapi.c @@ -97,9 +97,9 @@ static void nxt_php_disable(nxt_task_t *task, const char *type, nxt_str_t *value, char **ptr, nxt_php_disable_t disable); static nxt_int_t nxt_php_dirname(const nxt_str_t *file, nxt_str_t *dir); -static void nxt_php_str_trim_trail(nxt_str_t *str, u_char t); -static void nxt_php_str_trim_lead(nxt_str_t *str, u_char t); -nxt_inline u_char *nxt_realpath(const void *c); +static void nxt_php_str_trim_trail(nxt_str_t *str, char t); +static void nxt_php_str_trim_lead(nxt_str_t *str, char t); +nxt_inline char *nxt_realpath(const void *c); static nxt_int_t nxt_php_do_301(nxt_unit_request_info_t *req); static nxt_int_t nxt_php_handle_fs_err(nxt_unit_request_info_t *req); @@ -112,7 +112,7 @@ static void nxt_zend_stream_init_fp(zend_file_handle *handle, FILE *fp, const char *filename); #endif static void nxt_php_execute(nxt_php_run_ctx_t *ctx, nxt_unit_request_t *r); -nxt_inline void nxt_php_vcwd_chdir(nxt_unit_request_info_t *req, u_char *dir); +nxt_inline void nxt_php_vcwd_chdir(nxt_unit_request_info_t *req, char *dir); static int nxt_php_startup(sapi_module_struct *sapi_module); static int nxt_php_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC); @@ -524,7 +524,7 @@ static nxt_int_t nxt_php_set_target(nxt_task_t *task, nxt_php_target_t *target, nxt_conf_value_t *conf) { - u_char *tmp, *p; + char *tmp, *p; nxt_str_t str; nxt_int_t ret; nxt_conf_value_t *value; @@ -638,7 +638,7 @@ static nxt_int_t nxt_php_set_ini_path(nxt_task_t *task, nxt_str_t *ini_path, char *workdir) { size_t wdlen; - u_char *p, *start; + char *p, *start; if (ini_path->start[0] == '/' || workdir == NULL) { p = nxt_malloc(ini_path->length + 1); @@ -901,7 +901,7 @@ nxt_php_dirname(const nxt_str_t *file, nxt_str_t *dir) static void -nxt_php_str_trim_trail(nxt_str_t *str, u_char t) +nxt_php_str_trim_trail(nxt_str_t *str, char t) { while (str->length > 0 && str->start[str->length - 1] == t) { str->length--; @@ -912,7 +912,7 @@ nxt_php_str_trim_trail(nxt_str_t *str, u_char t) static void -nxt_php_str_trim_lead(nxt_str_t *str, u_char t) +nxt_php_str_trim_lead(nxt_str_t *str, char t) { while (str->length > 0 && str->start[0] == t) { str->length--; @@ -921,10 +921,10 @@ nxt_php_str_trim_lead(nxt_str_t *str, u_char t) } -nxt_inline u_char * +nxt_inline char * nxt_realpath(const void *c) { - return (u_char *) realpath(c, NULL); + return (char *) realpath(c, NULL); } @@ -1039,7 +1039,7 @@ nxt_php_request_handler(nxt_unit_request_info_t *req) static void nxt_php_dynamic_request(nxt_php_run_ctx_t *ctx, nxt_unit_request_t *r) { - u_char *p; + char *p; nxt_str_t path, script_name; nxt_int_t ret; @@ -1264,7 +1264,7 @@ nxt_php_execute(nxt_php_run_ctx_t *ctx, nxt_unit_request_t *r) nxt_inline void -nxt_php_vcwd_chdir(nxt_unit_request_info_t *req, u_char *dir) +nxt_php_vcwd_chdir(nxt_unit_request_info_t *req, char *dir) { if (nxt_slow_path(VCWD_CHDIR((char *) dir) != 0)) { nxt_unit_req_alert(req, "VCWD_CHDIR(%s) failed (%d: %s)", diff --git a/src/nxt_polarssl.c b/src/nxt_polarssl.c index 4a8144731..d62ceaf11 100644 --- a/src/nxt_polarssl.c +++ b/src/nxt_polarssl.c @@ -102,7 +102,7 @@ nxt_polarssl_log_error(nxt_uint_t level, nxt_log_t *log, int err, const char *fmt, ...) { va_list args; - u_char *p, *end, msg[NXT_MAX_ERROR_STR]; + char *p, *end, msg[NXT_MAX_ERROR_STR]; end = msg + NXT_MAX_ERROR_STR; diff --git a/src/nxt_port_hash.c b/src/nxt_port_hash.c index b23acfb28..b8137efc7 100644 --- a/src/nxt_port_hash.c +++ b/src/nxt_port_hash.c @@ -53,7 +53,7 @@ nxt_port_hash_lhq(nxt_lvlhsh_query_t *lhq, nxt_pid_port_id_t *pid_port) { lhq->key_hash = nxt_murmur_hash2(pid_port, sizeof(nxt_pid_port_id_t)); lhq->key.length = sizeof(nxt_pid_port_id_t); - lhq->key.start = (u_char *) pid_port; + lhq->key.start = (char *) pid_port; lhq->proto = &lvlhsh_ports_proto; lhq->pool = NULL; } diff --git a/src/nxt_port_memory.c b/src/nxt_port_memory.c index ad6e97ade..8c79b9c6b 100644 --- a/src/nxt_port_memory.c +++ b/src/nxt_port_memory.c @@ -117,7 +117,7 @@ nxt_port_mmaps_destroy(nxt_port_mmaps_t *port_mmaps, nxt_bool_t free_elts) static void nxt_port_mmap_buf_completion(nxt_task_t *task, void *obj, void *data) { - u_char *p; + char *p; nxt_mp_t *mp; nxt_buf_t *b, *next; nxt_process_t *process; @@ -371,7 +371,7 @@ nxt_shm_open(nxt_task_t *task, size_t size) #if (NXT_HAVE_MEMFD_CREATE || NXT_HAVE_SHM_OPEN) - u_char *p, name[64]; + char *p, name[64]; p = nxt_sprintf(name, name + sizeof(name), NXT_SHM_PREFIX "unit.%PI.%uxD", nxt_pid, nxt_random(&task->thread->random)); diff --git a/src/nxt_port_memory_int.h b/src/nxt_port_memory_int.h index 21a05b104..41d252862 100644 --- a/src/nxt_port_memory_int.h +++ b/src/nxt_port_memory_int.h @@ -100,22 +100,22 @@ nxt_inline void nxt_port_mmap_set_chunk_free(nxt_free_map_t *m, nxt_chunk_id_t c); nxt_inline nxt_chunk_id_t -nxt_port_mmap_chunk_id(nxt_port_mmap_header_t *hdr, const u_char *p) +nxt_port_mmap_chunk_id(nxt_port_mmap_header_t *hdr, const char *p) { - u_char *mm_start; + char *mm_start; - mm_start = (u_char *) hdr; + mm_start = (char *) hdr; return ((p - mm_start) - PORT_MMAP_HEADER_SIZE) / PORT_MMAP_CHUNK_SIZE; } -nxt_inline u_char * +nxt_inline char * nxt_port_mmap_chunk_start(nxt_port_mmap_header_t *hdr, nxt_chunk_id_t c) { - u_char *mm_start; + char *mm_start; - mm_start = (u_char *) hdr; + mm_start = (char *) hdr; return mm_start + PORT_MMAP_HEADER_SIZE + c * PORT_MMAP_CHUNK_SIZE; } diff --git a/src/nxt_port_rpc.c b/src/nxt_port_rpc.c index 285909335..aaea36360 100644 --- a/src/nxt_port_rpc.c +++ b/src/nxt_port_rpc.c @@ -73,7 +73,7 @@ nxt_port_rpc_lhq_stream(nxt_lvlhsh_query_t *lhq, uint32_t *stream) { lhq->key_hash = nxt_murmur_hash2(stream, sizeof(*stream)); lhq->key.length = sizeof(*stream); - lhq->key.start = (u_char *) stream; + lhq->key.start = (char *) stream; lhq->proto = &lvlhsh_rpc_reg_proto; } @@ -83,7 +83,7 @@ nxt_port_rpc_lhq_peer(nxt_lvlhsh_query_t *lhq, nxt_pid_t *peer) { lhq->key_hash = nxt_murmur_hash2(peer, sizeof(*peer)); lhq->key.length = sizeof(*peer); - lhq->key.start = (u_char *) peer; + lhq->key.start = (char *) peer; lhq->proto = &lvlhsh_rpc_reg_proto; } diff --git a/src/nxt_port_socket.c b/src/nxt_port_socket.c index 5752d5ab0..79e748ab0 100644 --- a/src/nxt_port_socket.c +++ b/src/nxt_port_socket.c @@ -1096,7 +1096,7 @@ nxt_port_frag_start(nxt_task_t *task, nxt_port_t *port, lhq.key_hash = nxt_murmur_hash2(&frag_key, sizeof(nxt_port_frag_key_t)); lhq.key.length = sizeof(nxt_port_frag_key_t); - lhq.key.start = (u_char *) &frag_key; + lhq.key.start = (char *) &frag_key; lhq.proto = &lvlhsh_frag_proto; lhq.replace = 0; lhq.value = fmsg; @@ -1146,7 +1146,7 @@ nxt_port_frag_find(nxt_task_t *task, nxt_port_t *port, nxt_port_recv_msg_t *msg) lhq.key_hash = nxt_murmur_hash2(&frag_key, sizeof(nxt_port_frag_key_t)); lhq.key.length = sizeof(nxt_port_frag_key_t); - lhq.key.start = (u_char *) &frag_key; + lhq.key.start = (char *) &frag_key; lhq.proto = &lvlhsh_frag_proto; lhq.pool = port->mem_pool; diff --git a/src/nxt_process.h b/src/nxt_process.h index 42fd1bed2..190507cc7 100644 --- a/src/nxt_process.h +++ b/src/nxt_process.h @@ -80,7 +80,7 @@ struct nxt_cgroup_s { typedef struct { - u_char *rootfs; + char *rootfs; nxt_process_automount_t automount; nxt_array_t *mounts; /* of nxt_mount_t */ diff --git a/src/nxt_process_title.c b/src/nxt_process_title.c index 3c20ac594..c5ab8ca02 100644 --- a/src/nxt_process_title.c +++ b/src/nxt_process_title.c @@ -38,14 +38,14 @@ char ***nxt_process_environ; */ -static u_char *nxt_process_title_start; -static u_char *nxt_process_title_end; +static char *nxt_process_title_start; +static char *nxt_process_title_end; void nxt_process_arguments(nxt_task_t *task, char **orig_argv, char ***orig_envp) { - u_char *p, *end, *argv_end, **argv, **env; + char *p, *end, *argv_end, **argv, **env; size_t size, argv_size, environ_size, strings_size; nxt_uint_t i; @@ -60,7 +60,7 @@ nxt_process_arguments(nxt_task_t *task, char **orig_argv, char ***orig_envp) * Set a conservative title space for a case if program argument * strings and environment strings are not contiguous. */ - argv = (u_char **) orig_argv; + argv = (char **) orig_argv; nxt_process_title_start = argv[0]; nxt_process_title_end = argv[0] + nxt_strlen(argv[0]); @@ -102,7 +102,7 @@ nxt_process_arguments(nxt_task_t *task, char **orig_argv, char ***orig_envp) nxt_process_argv = (char **) argv; argv_end = end; - env = (u_char **) *orig_envp; + env = (char **) *orig_envp; environ_size = sizeof(void *); for (i = 0; env[i] != NULL; i++) { @@ -189,7 +189,7 @@ nxt_process_arguments(nxt_task_t *task, char **orig_argv, char ***orig_envp) void nxt_process_title(nxt_task_t *task, const char *fmt, ...) { - u_char *p, *start, *end; + char *p, *start, *end; va_list args; start = nxt_process_title_start; diff --git a/src/nxt_random.c b/src/nxt_random.c index 8290488c8..6b5064e14 100644 --- a/src/nxt_random.c +++ b/src/nxt_random.c @@ -20,7 +20,7 @@ nxt_inline void nxt_random_start_schedule(nxt_random_t *r); static void nxt_random_stir(nxt_random_t *r); -static void nxt_random_add(nxt_random_t *r, const u_char *key, uint32_t len); +static void nxt_random_add(nxt_random_t *r, const char *key, uint32_t len); nxt_inline uint8_t nxt_random_byte(nxt_random_t *r); @@ -55,7 +55,7 @@ nxt_random_stir(nxt_random_t *r) struct timeval tv; union { uint32_t value[4]; - u_char bytes[NXT_RANDOM_KEY_SIZE]; + char bytes[NXT_RANDOM_KEY_SIZE]; } key; #if (NXT_HAVE_GETRANDOM) @@ -115,7 +115,7 @@ nxt_random_stir(nxt_random_t *r) static void -nxt_random_add(nxt_random_t *r, const u_char *key, uint32_t len) +nxt_random_add(nxt_random_t *r, const char *key, uint32_t len) { uint8_t val; uint32_t n; @@ -188,7 +188,7 @@ nxt_random_test(nxt_thread_t *thr) r.count = 400000; - nxt_random_add(&r, (u_char *) "arc4random", nxt_length("arc4random")); + nxt_random_add(&r, (char *) "arc4random", nxt_length("arc4random")); /* * Test arc4random() numbers. diff --git a/src/nxt_recvbuf.c b/src/nxt_recvbuf.c index 29a2b65d9..4a84f0379 100644 --- a/src/nxt_recvbuf.c +++ b/src/nxt_recvbuf.c @@ -10,7 +10,7 @@ nxt_uint_t nxt_recvbuf_mem_coalesce(nxt_recvbuf_coalesce_t *rb) { - u_char *last; + char *last; size_t size, total; nxt_int_t n; nxt_buf_t *b; diff --git a/src/nxt_regex.h b/src/nxt_regex.h index a24c50f80..be3189604 100644 --- a/src/nxt_regex.h +++ b/src/nxt_regex.h @@ -22,7 +22,7 @@ typedef struct { #if (NXT_HAVE_PCRE2) #define ERR_BUF_SIZE 256 - u_char msg[ERR_BUF_SIZE]; + char msg[ERR_BUF_SIZE]; #else const char *msg; #endif @@ -33,7 +33,7 @@ NXT_EXPORT void nxt_regex_init(void); NXT_EXPORT nxt_regex_t *nxt_regex_compile(nxt_mp_t *mp, nxt_str_t *source, nxt_regex_err_t *err); NXT_EXPORT nxt_regex_match_t *nxt_regex_match_create(nxt_mp_t *mp, size_t size); -NXT_EXPORT nxt_int_t nxt_regex_match(nxt_regex_t *re, u_char *subject, +NXT_EXPORT nxt_int_t nxt_regex_match(nxt_regex_t *re, char *subject, size_t length, nxt_regex_match_t *match); #endif /* NXT_HAVE_REGEX */ diff --git a/src/nxt_router.c b/src/nxt_router.c index 076cd134b..5a09ef5c0 100644 --- a/src/nxt_router.c +++ b/src/nxt_router.c @@ -118,7 +118,7 @@ static void nxt_router_conf_send(nxt_task_t *task, nxt_router_temp_conf_t *tmcf, nxt_port_msg_type_t type); static nxt_int_t nxt_router_conf_create(nxt_task_t *task, - nxt_router_temp_conf_t *tmcf, u_char *start, u_char *end); + nxt_router_temp_conf_t *tmcf, char *start, char *end); static nxt_int_t nxt_router_conf_process_static(nxt_task_t *task, nxt_router_conf_t *rtcf, nxt_conf_value_t *conf); static nxt_http_forward_t *nxt_router_conf_forward(nxt_task_t *task, @@ -948,7 +948,7 @@ nxt_router_app_restart_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg) static void nxt_router_status_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg) { - u_char *p; + char *p; size_t alloc; nxt_app_t *app; nxt_buf_t *b; @@ -1004,7 +1004,7 @@ nxt_router_status_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg) nxt_memcpy(p, app->name.start, app->name.length); app_stat->name.length = app->name.length; - app_stat->name.start = (u_char *) (p - b->mem.pos); + app_stat->name.start = (char *) (p - b->mem.pos); app_stat->active_requests = app->active_requests; app_stat->pending_processes = app->pending_processes; @@ -1615,9 +1615,9 @@ static nxt_conf_map_t nxt_router_websocket_conf[] = { static nxt_int_t nxt_router_conf_create(nxt_task_t *task, nxt_router_temp_conf_t *tmcf, - u_char *start, u_char *end) + char *start, char *end) { - u_char *p; + char *p; size_t size; nxt_mp_t *mp, *app_mp; uint32_t next, next_target; @@ -2045,7 +2045,7 @@ nxt_router_conf_create(nxt_task_t *task, nxt_router_temp_conf_t *tmcf, t = &skcf->body_temp_path; if (t->length == 0) { - t->start = (u_char *) task->thread->runtime->tmp; + t->start = (char *) task->thread->runtime->tmp; t->length = nxt_strlen(t->start); } @@ -2919,7 +2919,7 @@ nxt_router_listen_socket_error(nxt_task_t *task, nxt_port_recv_msg_t *msg, tmcf = rpc->temp_conf; #if 0 - u_char *p; + char *p; size_t size; uint8_t error; nxt_buf_t *in, *out; @@ -5413,7 +5413,7 @@ nxt_router_prepare_msg(nxt_task_t *task, nxt_http_request_t *r, nxt_app_t *app, const nxt_str_t *prefix) { void *target_pos, *query_pos; - u_char *pos, *end, *p, c; + char *pos, *end, *p, c; size_t fields_count, req_size, size, free_size; size_t copy_size; nxt_off_t content_length; @@ -5465,7 +5465,7 @@ nxt_router_prepare_msg(nxt_task_t *task, nxt_http_request_t *r, req->content_length = content_length; - p = (u_char *) (req->fields + fields_count); + p = (char *) (req->fields + fields_count); nxt_debug(task, "fields_count=%d", (int) fields_count); diff --git a/src/nxt_router_access_log.c b/src/nxt_router_access_log.c index afecd0b13..d9a7793f6 100644 --- a/src/nxt_router_access_log.c +++ b/src/nxt_router_access_log.c @@ -65,7 +65,7 @@ nxt_int_t nxt_router_access_log_create(nxt_task_t *task, nxt_router_conf_t *rtcf, nxt_conf_value_t *value) { - u_char *p; + char *p; nxt_int_t ret; nxt_str_t str; nxt_tstr_t *format; @@ -115,7 +115,7 @@ nxt_router_access_log_create(nxt_task_t *task, nxt_router_conf_t *rtcf, access_log->count = 1; access_log->path.length = alcf.path.length; - access_log->path.start = (u_char *) access_log + access_log->path.start = (char *) access_log + sizeof(nxt_router_access_log_t); nxt_memcpy(access_log->path.start, alcf.path.start, alcf.path.length); diff --git a/src/nxt_runtime.c b/src/nxt_runtime.c index de76f19e0..0449d58c1 100644 --- a/src/nxt_runtime.c +++ b/src/nxt_runtime.c @@ -80,7 +80,7 @@ nxt_runtime_create(nxt_task_t *task) /* Should not fail. */ lang = nxt_array_add(rt->languages); lang->type = NXT_APP_EXTERNAL; - lang->version = (u_char *) ""; + lang->version = (char *) ""; lang->file = NULL; lang->module = &nxt_external_module; @@ -151,13 +151,13 @@ nxt_runtime_create(nxt_task_t *task) static nxt_int_t nxt_runtime_inherited_listen_sockets(nxt_task_t *task, nxt_runtime_t *rt) { - u_char *v, *p; + char *v, *p; nxt_int_t type; nxt_array_t *inherited_sockets; nxt_socket_t s; nxt_listen_socket_t *ls; - v = (u_char *) getenv("NGINX"); + v = (char *) getenv("NGINX"); if (v == NULL) { return nxt_runtime_systemd_listen_sockets(task, rt); @@ -215,7 +215,7 @@ nxt_runtime_inherited_listen_sockets(nxt_task_t *task, nxt_runtime_t *rt) static nxt_int_t nxt_runtime_systemd_listen_sockets(nxt_task_t *task, nxt_runtime_t *rt) { - u_char *nfd, *pid; + char *nfd, *pid; nxt_int_t n; nxt_array_t *inherited_sockets; nxt_socket_t s; @@ -225,13 +225,13 @@ nxt_runtime_systemd_listen_sockets(nxt_task_t *task, nxt_runtime_t *rt) * Number of listening sockets passed. The socket * descriptors start from number 3 and are sequential. */ - nfd = (u_char *) getenv("LISTEN_FDS"); + nfd = (char *) getenv("LISTEN_FDS"); if (nfd == NULL) { return NXT_OK; } /* The pid of the service process. */ - pid = (u_char *) getenv("LISTEN_PID"); + pid = (char *) getenv("LISTEN_PID"); if (pid == NULL) { return NXT_OK; } @@ -922,7 +922,7 @@ nxt_runtime_conf_init(nxt_task_t *task, nxt_runtime_t *rt) } control.length = nxt_strlen(rt->control); - control.start = (u_char *) rt->control; + control.start = (char *) rt->control; sa = nxt_sockaddr_parse(rt->mem_pool, &control); if (nxt_slow_path(sa == NULL)) { @@ -945,8 +945,8 @@ static nxt_int_t nxt_runtime_conf_read_cmd(nxt_task_t *task, nxt_runtime_t *rt) { char *p, **argv; - u_char *end; - u_char buf[1024]; + char *end; + char buf[1024]; static const char version[] = "unit version: " NXT_VERSION "\n" @@ -1289,7 +1289,7 @@ nxt_runtime_hostname(nxt_task_t *task, nxt_runtime_t *rt) rt->hostname.start = nxt_mp_nget(rt->mem_pool, length); if (rt->hostname.start != NULL) { - nxt_memcpy_lowcase(rt->hostname.start, (u_char *) hostname, length); + nxt_memcpy_lowcase(rt->hostname.start, (char *) hostname, length); return NXT_OK; } @@ -1455,7 +1455,7 @@ nxt_str_t * nxt_current_directory(nxt_mp_t *mp) { size_t length; - u_char *p; + char *p; nxt_str_t *name; char buf[NXT_MAX_PATH_LEN]; @@ -1482,7 +1482,7 @@ nxt_runtime_pid_file_create(nxt_task_t *task, nxt_file_name_t *pid_file) ssize_t length; nxt_int_t n; nxt_file_t file; - u_char pid[NXT_INT64_T_LEN + nxt_length("\n")]; + char pid[NXT_INT64_T_LEN + nxt_length("\n")]; nxt_memzero(&file, sizeof(nxt_file_t)); @@ -1573,7 +1573,7 @@ nxt_runtime_process_lhq_pid(nxt_lvlhsh_query_t *lhq, nxt_pid_t *pid) { lhq->key_hash = nxt_murmur_hash2(pid, sizeof(*pid)); lhq->key.length = sizeof(*pid); - lhq->key.start = (u_char *) pid; + lhq->key.start = (char *) pid; lhq->proto = &lvlhsh_processes_proto; } diff --git a/src/nxt_script.c b/src/nxt_script.c index 05d9561da..9deea57ef 100644 --- a/src/nxt_script.c +++ b/src/nxt_script.c @@ -38,10 +38,10 @@ static nxt_lvlhsh_t nxt_script_info; nxt_script_t * -nxt_script_new(nxt_task_t *task, nxt_str_t *name, u_char *data, size_t size, - u_char *error) +nxt_script_new(nxt_task_t *task, nxt_str_t *name, char *data, size_t size, + char *error) { - u_char *start; + char *start; njs_vm_t *vm; njs_str_t mod_name; njs_mod_t *mod; @@ -52,7 +52,7 @@ nxt_script_new(nxt_task_t *task, nxt_str_t *name, u_char *data, size_t size, opts.backtrace = 1; - opts.file.start = (u_char *) "default"; + opts.file.start = (char *) "default"; opts.file.length = 7; vm = njs_vm_create(&opts); @@ -80,7 +80,7 @@ nxt_script_new(nxt_task_t *task, nxt_str_t *name, u_char *data, size_t size, } script->text.length = size; - script->text.start = (u_char *) script + sizeof(nxt_script_t); + script->text.start = (char *) script + sizeof(nxt_script_t); nxt_memcpy(script->text.start, data, size); @@ -102,7 +102,7 @@ nxt_script_get(nxt_task_t *task, nxt_str_t *name, nxt_fd_t fd) nxt_int_t ret; nxt_str_t text; nxt_script_t *script; - u_char error[NXT_MAX_ERROR_STR]; + char error[NXT_MAX_ERROR_STR]; ret = nxt_script_file_read(fd, &text); if (nxt_slow_path(ret != NXT_OK)) { @@ -335,7 +335,7 @@ nxt_script_store_load(nxt_task_t *task, nxt_mp_t *mp) { DIR *dir; size_t size, alloc; - u_char *buf, *p; + char *buf, *p; nxt_str_t name; nxt_int_t ret; nxt_file_t file; @@ -376,7 +376,7 @@ nxt_script_store_load(nxt_task_t *task, nxt_mp_t *mp) rt->scripts.start, de->d_name); name.length = nxt_strlen(de->d_name); - name.start = (u_char *) de->d_name; + name.start = (char *) de->d_name; if (nxt_str_eq(&name, ".", 1) || nxt_str_eq(&name, "..", 2)) { continue; @@ -530,7 +530,7 @@ nxt_script_buf_completion(nxt_task_t *task, void *obj, void *data) void nxt_script_store_get_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg) { - u_char *p; + char *p; nxt_int_t ret; nxt_str_t name; nxt_file_t file; @@ -619,7 +619,7 @@ nxt_script_store_delete(nxt_task_t *task, nxt_str_t *name, nxt_mp_t *mp) void nxt_script_store_delete_handler(nxt_task_t *task, nxt_port_recv_msg_t *msg) { - u_char *p; + char *p; nxt_str_t name; nxt_port_t *ctl_port; nxt_runtime_t *rt; diff --git a/src/nxt_script.h b/src/nxt_script.h index ffefc108f..b587fec73 100644 --- a/src/nxt_script.h +++ b/src/nxt_script.h @@ -10,8 +10,8 @@ typedef struct nxt_script_s nxt_script_t; -nxt_script_t *nxt_script_new(nxt_task_t *task, nxt_str_t *name, u_char *data, - size_t size, u_char *error); +nxt_script_t *nxt_script_new(nxt_task_t *task, nxt_str_t *name, char *data, + size_t size, char *error); void nxt_script_destroy(nxt_script_t *script); void nxt_script_info_init(nxt_task_t *task, nxt_array_t *scripts); diff --git a/src/nxt_sendbuf.c b/src/nxt_sendbuf.c index 94f8e9eb9..244a12bb5 100644 --- a/src/nxt_sendbuf.c +++ b/src/nxt_sendbuf.c @@ -17,7 +17,7 @@ nxt_uint_t nxt_sendbuf_mem_coalesce0(nxt_task_t *task, nxt_sendbuf_t *sb, struct iovec *iov, nxt_uint_t niov_max) { - u_char *last; + char *last; size_t size, total; nxt_buf_t *b; nxt_uint_t n; @@ -87,7 +87,7 @@ nxt_sendbuf_mem_coalesce0(nxt_task_t *task, nxt_sendbuf_t *sb, nxt_uint_t nxt_sendbuf_mem_coalesce(nxt_task_t *task, nxt_sendbuf_coalesce_t *sb) { - u_char *last; + char *last; size_t size, total; nxt_buf_t *b; nxt_uint_t n; diff --git a/src/nxt_sha1.c b/src/nxt_sha1.c index 407c5933c..80f625275 100644 --- a/src/nxt_sha1.c +++ b/src/nxt_sha1.c @@ -11,7 +11,7 @@ #include -static const u_char *nxt_sha1_body(nxt_sha1_t *ctx, const u_char *data, +static const char *nxt_sha1_body(nxt_sha1_t *ctx, const char *data, size_t size); @@ -45,7 +45,7 @@ nxt_sha1_update(nxt_sha1_t *ctx, const void *data, size_t size) } memcpy(&ctx->buffer[used], data, free); - data = (u_char *) data + free; + data = (char *) data + free; size -= free; (void) nxt_sha1_body(ctx, ctx->buffer, 64); } @@ -60,7 +60,7 @@ nxt_sha1_update(nxt_sha1_t *ctx, const void *data, size_t size) void -nxt_sha1_final(u_char result[20], nxt_sha1_t *ctx) +nxt_sha1_final(char result[20], nxt_sha1_t *ctx) { size_t used, free; @@ -152,14 +152,14 @@ nxt_sha1_final(u_char result[20], nxt_sha1_t *ctx) * the bit counters. There are no alignment requirements. */ -static const u_char * -nxt_sha1_body(nxt_sha1_t *ctx, const u_char *data, size_t size) +static const char * +nxt_sha1_body(nxt_sha1_t *ctx, const char *data, size_t size) { uint32_t a, b, c, d, e, temp; uint32_t saved_a, saved_b, saved_c, saved_d, saved_e; uint32_t words[80]; nxt_uint_t i; - const u_char *p; + const char *p; p = data; diff --git a/src/nxt_sha1.h b/src/nxt_sha1.h index 2816982b6..810daaa88 100644 --- a/src/nxt_sha1.h +++ b/src/nxt_sha1.h @@ -12,13 +12,13 @@ typedef struct { uint64_t bytes; uint32_t a, b, c, d, e; - u_char buffer[64]; + char buffer[64]; } nxt_sha1_t; NXT_EXPORT void nxt_sha1_init(nxt_sha1_t *ctx); NXT_EXPORT void nxt_sha1_update(nxt_sha1_t *ctx, const void *data, size_t size); -NXT_EXPORT void nxt_sha1_final(u_char result[20], nxt_sha1_t *ctx); +NXT_EXPORT void nxt_sha1_final(char result[20], nxt_sha1_t *ctx); #endif /* _NXT_SHA1_H_INCLUDED_ */ diff --git a/src/nxt_sockaddr.c b/src/nxt_sockaddr.c index 32941893d..1c56b85b1 100644 --- a/src/nxt_sockaddr.c +++ b/src/nxt_sockaddr.c @@ -8,7 +8,7 @@ #if (NXT_INET6) -static u_char *nxt_inet6_ntop(u_char *addr, u_char *buf, u_char *end); +static char *nxt_inet6_ntop(char *addr, char *buf, char *end); #endif static nxt_sockaddr_t *nxt_sockaddr_unix_parse(nxt_mp_t *mp, nxt_str_t *addr); @@ -229,7 +229,7 @@ void nxt_sockaddr_text(nxt_sockaddr_t *sa) { size_t offset; - u_char *p, *start, *end, *octet; + char *p, *start, *end, *octet; uint32_t port; offset = offsetof(nxt_sockaddr_t, u) + sa->socklen; @@ -244,7 +244,7 @@ nxt_sockaddr_text(nxt_sockaddr_t *sa) case AF_INET: sa->address_start = offset; - octet = (u_char *) &sa->u.sockaddr_in.sin_addr; + octet = (char *) &sa->u.sockaddr_in.sin_addr; p = nxt_sprintf(start, end, "%ud.%ud.%ud.%ud", octet[0], octet[1], octet[2], octet[3]); @@ -282,7 +282,7 @@ nxt_sockaddr_text(nxt_sockaddr_t *sa) case AF_UNIX: sa->address_start = offset; - p = (u_char *) sa->u.sockaddr_un.sun_path; + p = (char *) sa->u.sockaddr_un.sun_path; #if (NXT_LINUX) @@ -431,10 +431,10 @@ nxt_sockaddr_cmp(nxt_sockaddr_t *sa1, nxt_sockaddr_t *sa2) #if (NXT_INET6) -static u_char * -nxt_inet6_ntop(u_char *addr, u_char *buf, u_char *end) +static char * +nxt_inet6_ntop(char *addr, char *buf, char *end) { - u_char *p; + char *p; size_t zero_groups, last_zero_groups, ipv6_bytes; nxt_uint_t i, zero_start, last_zero_start; @@ -573,7 +573,7 @@ nxt_sockaddr_unix_parse(nxt_mp_t *mp, nxt_str_t *addr) { #if (NXT_HAVE_UNIX_DOMAIN) size_t length, socklen; - u_char *path; + char *path; nxt_sockaddr_t *sa; /* @@ -644,7 +644,7 @@ static nxt_sockaddr_t * nxt_sockaddr_inet6_parse(nxt_mp_t *mp, nxt_str_t *addr) { #if (NXT_INET6) - u_char *p, *start, *end; + char *p, *start, *end; size_t length; nxt_int_t ret, port; nxt_sockaddr_t *sa; @@ -717,7 +717,7 @@ nxt_sockaddr_inet6_parse(nxt_mp_t *mp, nxt_str_t *addr) static nxt_sockaddr_t * nxt_sockaddr_inet_parse(nxt_mp_t *mp, nxt_str_t *addr) { - u_char *p; + char *p; size_t length; nxt_int_t port; in_addr_t inaddr; @@ -771,9 +771,9 @@ nxt_sockaddr_inet_parse(nxt_mp_t *mp, nxt_str_t *addr) in_addr_t -nxt_inet_addr(u_char *buf, size_t length) +nxt_inet_addr(char *buf, size_t length) { - u_char c, *end; + char c, *end; in_addr_t addr; nxt_uint_t digit, octet, dots; @@ -821,9 +821,9 @@ nxt_inet_addr(u_char *buf, size_t length) #if (NXT_INET6) nxt_int_t -nxt_inet6_addr(struct in6_addr *in6_addr, u_char *buf, size_t length) +nxt_inet6_addr(struct in6_addr *in6_addr, char *buf, size_t length) { - u_char c, *addr, *zero_start, *ipv4, *dst, *src, *end; + char c, *addr, *zero_start, *ipv4, *dst, *src, *end; nxt_uint_t digit, group, nibbles, groups_left; if (length == 0) { @@ -962,7 +962,7 @@ nxt_inet6_addr(struct in6_addr *in6_addr, u_char *buf, size_t length) nxt_bool_t nxt_inet6_probe(nxt_str_t *str) { - u_char *colon, *end; + char *colon, *end; colon = memchr(str->start, ':', str->length); diff --git a/src/nxt_sockaddr.h b/src/nxt_sockaddr.h index 0f96f6dd6..5e937c5fe 100644 --- a/src/nxt_sockaddr.h +++ b/src/nxt_sockaddr.h @@ -82,9 +82,9 @@ NXT_EXPORT nxt_bool_t nxt_sockaddr_cmp(nxt_sockaddr_t *sa1, NXT_EXPORT nxt_sockaddr_t *nxt_sockaddr_parse(nxt_mp_t *mp, nxt_str_t *addr); NXT_EXPORT nxt_sockaddr_t *nxt_sockaddr_parse_optport(nxt_mp_t *mp, nxt_str_t *addr); -NXT_EXPORT in_addr_t nxt_inet_addr(u_char *buf, size_t len); +NXT_EXPORT in_addr_t nxt_inet_addr(char *buf, size_t len); #if (NXT_INET6) -NXT_EXPORT nxt_int_t nxt_inet6_addr(struct in6_addr *in6_addr, u_char *buf, +NXT_EXPORT nxt_int_t nxt_inet6_addr(struct in6_addr *in6_addr, char *buf, size_t len); #endif NXT_EXPORT nxt_bool_t nxt_inet6_probe(nxt_str_t *addr); diff --git a/src/nxt_socket_msg.h b/src/nxt_socket_msg.h index 81617bd69..b0b320995 100644 --- a/src/nxt_socket_msg.h +++ b/src/nxt_socket_msg.h @@ -44,13 +44,13 @@ typedef struct cmsgcred nxt_socket_cred_t; typedef struct { size_t size; - u_char buf[NXT_OOB_RECV_SIZE]; + char buf[NXT_OOB_RECV_SIZE]; } nxt_recv_oob_t; typedef struct { size_t size; - u_char buf[NXT_OOB_SEND_SIZE]; + char buf[NXT_OOB_SEND_SIZE]; } nxt_send_oob_t; diff --git a/src/nxt_sprintf.c b/src/nxt_sprintf.c index 875f43a59..641f85439 100644 --- a/src/nxt_sprintf.c +++ b/src/nxt_sprintf.c @@ -55,10 +55,10 @@ */ -u_char * nxt_cdecl -nxt_sprintf(u_char *buf, u_char *end, const char *fmt, ...) +char * nxt_cdecl +nxt_sprintf(char *buf, char *end, const char *fmt, ...) { - u_char *p; + char *p; va_list args; va_start(args, fmt); @@ -76,17 +76,17 @@ nxt_sprintf(u_char *buf, u_char *end, const char *fmt, ...) */ typedef struct { - u_char *end; - const u_char *hex; + char *end; + const char *hex; uint32_t width; int32_t frac_width; uint8_t max_width; - u_char padding; + char padding; } nxt_sprintf_t; -static u_char *nxt_integer(nxt_sprintf_t *spf, u_char *buf, uint64_t ui64); -static u_char *nxt_number(nxt_sprintf_t *spf, u_char *buf, double n); +static char *nxt_integer(nxt_sprintf_t *spf, char *buf, uint64_t ui64); +static char *nxt_number(nxt_sprintf_t *spf, char *buf, double n); /* A right way of "f == 0.0". */ @@ -94,8 +94,8 @@ static u_char *nxt_number(nxt_sprintf_t *spf, u_char *buf, double n); (fabs(f) <= FLT_EPSILON) -u_char * -nxt_vsprintf(u_char *buf, u_char *end, const char *fmt, va_list args) +char * +nxt_vsprintf(char *buf, char *end, const char *fmt, va_list args) { int d; double f, i; @@ -108,15 +108,15 @@ nxt_vsprintf(u_char *buf, u_char *end, const char *fmt, va_list args) nxt_msec_t ms; nxt_nsec_t ns; nxt_bool_t sign; - const u_char *p; + const char *p; nxt_sprintf_t spf; nxt_file_name_t *fn; - static const u_char hexadecimal[16] = "0123456789abcdef"; - static const u_char HEXADECIMAL[16] = "0123456789ABCDEF"; - static const u_char nan[] = "[nan]"; - static const u_char null[] = "[null]"; - static const u_char infinity[] = "[infinity]"; + static const char hexadecimal[16] = "0123456789abcdef"; + static const char HEXADECIMAL[16] = "0123456789ABCDEF"; + static const char nan[] = "[nan]"; + static const char null[] = "[null]"; + static const char infinity[] = "[infinity]"; spf.end = end; @@ -153,7 +153,7 @@ nxt_vsprintf(u_char *buf, u_char *end, const char *fmt, va_list args) case 's': fmt++; - p = va_arg(args, const u_char *); + p = va_arg(args, const char *); if (nxt_slow_path(p == NULL)) { buf = nxt_cpymem(buf, null, nxt_length(null)); @@ -173,7 +173,7 @@ nxt_vsprintf(u_char *buf, u_char *end, const char *fmt, va_list args) if (*fmt == 's') { fmt++; - p = va_arg(args, const u_char *); + p = va_arg(args, const char *); if (nxt_slow_path(p == NULL)) { buf = nxt_cpymem(buf, null, nxt_length(null)); @@ -571,12 +571,12 @@ nxt_vsprintf(u_char *buf, u_char *end, const char *fmt, va_list args) } -static u_char * -nxt_integer(nxt_sprintf_t *spf, u_char *buf, uint64_t ui64) +static char * +nxt_integer(nxt_sprintf_t *spf, char *buf, uint64_t ui64) { - u_char *p, *end; + char *p, *end; size_t length; - u_char temp[NXT_INT64_T_LEN]; + char temp[NXT_INT64_T_LEN]; p = temp + NXT_INT64_T_LEN; @@ -585,7 +585,7 @@ nxt_integer(nxt_sprintf_t *spf, u_char *buf, uint64_t ui64) #if (NXT_32BIT) for ( ;; ) { - u_char *start; + char *start; uint32_t ui32; /* @@ -683,12 +683,12 @@ nxt_integer(nxt_sprintf_t *spf, u_char *buf, uint64_t ui64) } -static u_char * -nxt_number(nxt_sprintf_t *spf, u_char *buf, double n) +static char * +nxt_number(nxt_sprintf_t *spf, char *buf, double n) { - u_char *p, *end; + char *p, *end; size_t length; - u_char temp[NXT_DOUBLE_LEN]; + char temp[NXT_DOUBLE_LEN]; p = temp + NXT_DOUBLE_LEN; diff --git a/src/nxt_sprintf.h b/src/nxt_sprintf.h index 0a927f710..c0c66aded 100644 --- a/src/nxt_sprintf.h +++ b/src/nxt_sprintf.h @@ -12,9 +12,9 @@ #define NXT_DOUBLE_LEN (1 + DBL_MAX_10_EXP) -NXT_EXPORT u_char *nxt_cdecl nxt_sprintf(u_char *buf, u_char *end, +NXT_EXPORT char *nxt_cdecl nxt_sprintf(char *buf, char *end, const char *fmt, ...); -NXT_EXPORT u_char *nxt_vsprintf(u_char *buf, u_char *end, +NXT_EXPORT char *nxt_vsprintf(char *buf, char *end, const char *fmt, va_list args); diff --git a/src/nxt_status.c b/src/nxt_status.c index 92cbf2e65..c2bcaad09 100644 --- a/src/nxt_status.c +++ b/src/nxt_status.c @@ -100,7 +100,7 @@ nxt_status_get(nxt_status_report_t *report, nxt_mp_t *mp) return NULL; } - mod_name.start = (u_char *)modules[i].name; + mod_name.start = modules[i].name; mod_name.length = strlen(modules[i].name); nxt_conf_set_member(mods, &mod_name, mod_obj, l++); } @@ -118,7 +118,7 @@ nxt_status_get(nxt_status_report_t *report, nxt_mp_t *mp) item.length = nxt_strlen(modules[i].version); nxt_conf_set_member_string(obj, &version_str, &item, 0); - item.start = (u_char *)modules[i].file; + item.start = modules[i].file; item.length = strlen(modules[i].file); nxt_conf_set_member_string(obj, &lib_str, &item, 1); diff --git a/src/nxt_string.c b/src/nxt_string.c index 1ca595a1c..597243100 100644 --- a/src/nxt_string.c +++ b/src/nxt_string.c @@ -33,7 +33,7 @@ nxt_str_alloc(nxt_mp_t *mp, size_t length) nxt_str_t * nxt_str_dup(nxt_mp_t *mp, nxt_str_t *dst, const nxt_str_t *src) { - u_char *p; + char *p; if (dst == NULL) { /* The string start is allocated aligned to be close to nxt_str_t. */ @@ -42,7 +42,7 @@ nxt_str_dup(nxt_mp_t *mp, nxt_str_t *dst, const nxt_str_t *src) return NULL; } - p = (u_char *) dst; + p = (char *) dst; p += sizeof(nxt_str_t); dst->start = p; @@ -64,7 +64,7 @@ nxt_str_dup(nxt_mp_t *mp, nxt_str_t *dst, const nxt_str_t *src) * nxt_str_cstrz() creates a C style zero-terminated copy of a source * nxt_str_t. The function is intended to create strings suitable * for libc and kernel interfaces so result is pointer to char instead - * of u_char to minimize casts. + * of char to minimize casts. */ char * @@ -84,9 +84,9 @@ nxt_str_cstrz(nxt_mp_t *mp, const nxt_str_t *src) void -nxt_memcpy_lowcase(u_char *dst, const u_char *src, size_t length) +nxt_memcpy_lowcase(char *dst, const char *src, size_t length) { - u_char c; + char c; while (length != 0) { c = *src++; @@ -97,9 +97,9 @@ nxt_memcpy_lowcase(u_char *dst, const u_char *src, size_t length) void -nxt_memcpy_upcase(u_char *dst, const u_char *src, size_t length) +nxt_memcpy_upcase(char *dst, const char *src, size_t length) { - u_char c; + char c; while (length != 0) { c = *src++; @@ -109,8 +109,8 @@ nxt_memcpy_upcase(u_char *dst, const u_char *src, size_t length) } -u_char * -nxt_cpystr(u_char *dst, const u_char *src) +char * +nxt_cpystr(char *dst, const char *src) { for ( ;; ) { *dst = *src; @@ -127,8 +127,8 @@ nxt_cpystr(u_char *dst, const u_char *src) } -u_char * -nxt_cpystrn(u_char *dst, const u_char *src, size_t length) +char * +nxt_cpystrn(char *dst, const char *src, size_t length) { if (length == 0) { return dst; @@ -152,9 +152,9 @@ nxt_cpystrn(u_char *dst, const u_char *src, size_t length) nxt_int_t -nxt_strcasecmp(const u_char *s1, const u_char *s2) +nxt_strcasecmp(const char *s1, const char *s2) { - u_char c1, c2; + char c1, c2; nxt_int_t n; for ( ;; ) { @@ -178,9 +178,9 @@ nxt_strcasecmp(const u_char *s1, const u_char *s2) nxt_int_t -nxt_strncasecmp(const u_char *s1, const u_char *s2, size_t length) +nxt_strncasecmp(const char *s1, const char *s2, size_t length) { - u_char c1, c2; + char c1, c2; nxt_int_t n; while (length-- != 0) { @@ -208,9 +208,9 @@ nxt_strncasecmp(const u_char *s1, const u_char *s2, size_t length) nxt_int_t nxt_memcasecmp(const void *p1, const void *p2, size_t length) { - u_char c1, c2; + char c1, c2; nxt_int_t n; - const u_char *s1, *s2; + const char *s1, *s2; s1 = p1; s2 = p2; @@ -239,12 +239,12 @@ nxt_memcasecmp(const void *p1, const void *p2, size_t length) * Zeros are ignored in both strings. */ -u_char * -nxt_memstrn(const u_char *s, const u_char *end, const char *ss, size_t length) +char * +nxt_memstrn(const char *s, const char *end, const char *ss, size_t length) { - u_char c1, c2, *s2; + char c1, c2, *s2; - s2 = (u_char *) ss; + s2 = (char *) ss; c2 = *s2++; length--; @@ -258,7 +258,7 @@ nxt_memstrn(const u_char *s, const u_char *end, const char *ss, size_t length) } if (memcmp(s, s2, length) == 0) { - return (u_char *) s - 1; + return (char *) s - 1; } } } @@ -273,13 +273,13 @@ nxt_memstrn(const u_char *s, const u_char *end, const char *ss, size_t length) * Zeros are ignored in both strings. */ -u_char * -nxt_memcasestrn(const u_char *s, const u_char *end, const char *ss, +char * +nxt_memcasestrn(const char *s, const char *end, const char *ss, size_t length) { - u_char c1, c2, *s2; + char c1, c2, *s2; - s2 = (u_char *) ss; + s2 = (char *) ss; c2 = *s2++; c2 = nxt_lowcase(c2); length--; @@ -295,7 +295,7 @@ nxt_memcasestrn(const u_char *s, const u_char *end, const char *ss, } if (nxt_memcasecmp(s, s2, length) == 0) { - return (u_char *) s - 1; + return (char *) s - 1; } } } @@ -310,14 +310,14 @@ nxt_memcasestrn(const u_char *s, const u_char *end, const char *ss, * in reverse order. Zeros are ignored in both strings. */ -u_char * -nxt_rmemstrn(const u_char *s, const u_char *end, const char *ss, size_t length) +char * +nxt_rmemstrn(const char *s, const char *end, const char *ss, size_t length) { - u_char c1, c2; - const u_char *s1, *s2; + char c1, c2; + const char *s1, *s2; s1 = end - length; - s2 = (u_char *) ss; + s2 = (char *) ss; c2 = *s2++; length--; @@ -326,7 +326,7 @@ nxt_rmemstrn(const u_char *s, const u_char *end, const char *ss, size_t length) if (c1 == c2) { if (memcmp(s1 + 1, s2, length) == 0) { - return (u_char *) s1; + return (char *) s1; } } @@ -338,9 +338,9 @@ nxt_rmemstrn(const u_char *s, const u_char *end, const char *ss, size_t length) size_t -nxt_str_strip(const u_char *start, u_char *end) +nxt_str_strip(const char *start, char *end) { - u_char *p; + char *p; for (p = end - 1; p >= start; p--) { if (*p != '\r' && *p != '\n') { @@ -353,9 +353,9 @@ nxt_str_strip(const u_char *start, u_char *end) nxt_int_t -nxt_strverscmp(const u_char *s1, const u_char *s2) +nxt_strverscmp(const char *s1, const char *s2) { - u_char c1, c2; + char c1, c2; nxt_int_t diff; enum { @@ -447,9 +447,9 @@ nxt_strverscmp(const u_char *s1, const u_char *s2) nxt_bool_t -nxt_strvers_match(u_char *version, u_char *prefix, size_t length) +nxt_strvers_match(char *version, char *prefix, size_t length) { - u_char next, last; + char next, last; if (length == 0) { return 1; @@ -516,10 +516,10 @@ static const uint32_t nxt_uri_escape[] = { }; -u_char * -nxt_decode_uri(u_char *dst, u_char *src, size_t length) +char * +nxt_decode_uri(char *dst, char *src, size_t length) { - u_char *end, ch; + char *end, ch; uint8_t d0, d1; nxt_prefetch(&nxt_hex2int['0']); @@ -551,10 +551,10 @@ nxt_decode_uri(u_char *dst, u_char *src, size_t length) } -u_char * -nxt_decode_uri_plus(u_char *dst, u_char *src, size_t length) +char * +nxt_decode_uri_plus(char *dst, char *src, size_t length) { - u_char *end, ch; + char *end, ch; uint8_t d0, d1; nxt_prefetch(&nxt_hex2int['0']); @@ -593,12 +593,12 @@ nxt_decode_uri_plus(u_char *dst, u_char *src, size_t length) uintptr_t -nxt_encode_uri(u_char *dst, u_char *src, size_t length) +nxt_encode_uri(char *dst, char *src, size_t length) { - u_char *end; + char *end; nxt_uint_t n; - static const u_char hex[16] = "0123456789ABCDEF"; + static const char hex[16] = "0123456789ABCDEF"; end = src + length; @@ -639,14 +639,14 @@ nxt_encode_uri(u_char *dst, u_char *src, size_t length) uintptr_t -nxt_encode_complex_uri(u_char *dst, u_char *src, size_t length) +nxt_encode_complex_uri(char *dst, char *src, size_t length) { - u_char *reserved, *end, ch; + char *reserved, *end, ch; nxt_uint_t n; - static const u_char hex[16] = "0123456789ABCDEF"; + static const char hex[16] = "0123456789ABCDEF"; - reserved = (u_char *) "?#\0"; + reserved = (char *) "?#\0"; end = src + length; @@ -703,12 +703,12 @@ nxt_encode_complex_uri(u_char *dst, u_char *src, size_t length) nxt_bool_t -nxt_is_complex_uri_encoded(u_char *src, size_t length) +nxt_is_complex_uri_encoded(char *src, size_t length) { - u_char *reserved, *end, ch; + char *reserved, *end, ch; uint8_t d0, d1; - reserved = (u_char *) "?#\0"; + reserved = (char *) "?#\0"; for (end = src + length; src < end; src++) { ch = *src; @@ -748,9 +748,9 @@ nxt_is_complex_uri_encoded(u_char *src, size_t length) ssize_t -nxt_base64_decode(u_char *dst, u_char *src, size_t length) +nxt_base64_decode(char *dst, char *src, size_t length) { - u_char *end, *p; + char *end, *p; size_t pad; uint8_t v1, v2, v3, v4; diff --git a/src/nxt_string.h b/src/nxt_string.h index 18ea5490d..e6cfa9456 100644 --- a/src/nxt_string.h +++ b/src/nxt_string.h @@ -30,7 +30,7 @@ #define nxt_strchr(buf, delim) \ - (u_char *) strchr((char *) buf, delim) + (char *) strchr((char *) buf, delim) #define nxt_memzero(buf, length) \ @@ -45,9 +45,9 @@ (void) memcpy(dst, src, length) -NXT_EXPORT void nxt_memcpy_lowcase(u_char *dst, const u_char *src, +NXT_EXPORT void nxt_memcpy_lowcase(char *dst, const char *src, size_t length); -NXT_EXPORT void nxt_memcpy_upcase(u_char *dst, const u_char *src, +NXT_EXPORT void nxt_memcpy_upcase(char *dst, const char *src, size_t length); @@ -58,7 +58,7 @@ NXT_EXPORT void nxt_memcpy_upcase(u_char *dst, const u_char *src, nxt_inline void * nxt_cpymem(void *dst, const void *src, size_t length) { - return ((u_char *) memcpy(dst, src, length)) + length; + return ((char *) memcpy(dst, src, length)) + length; } @@ -74,38 +74,38 @@ nxt_cpymem(void *dst, const void *src, size_t length) strncmp((char *) s1, (char *) s2, length) -NXT_EXPORT u_char *nxt_cpystr(u_char *dst, const u_char *src); -NXT_EXPORT u_char *nxt_cpystrn(u_char *dst, const u_char *src, size_t length); -NXT_EXPORT nxt_int_t nxt_strcasecmp(const u_char *s1, const u_char *s2); -NXT_EXPORT nxt_int_t nxt_strncasecmp(const u_char *s1, const u_char *s2, +NXT_EXPORT char *nxt_cpystr(char *dst, const char *src); +NXT_EXPORT char *nxt_cpystrn(char *dst, const char *src, size_t length); +NXT_EXPORT nxt_int_t nxt_strcasecmp(const char *s1, const char *s2); +NXT_EXPORT nxt_int_t nxt_strncasecmp(const char *s1, const char *s2, size_t length); NXT_EXPORT nxt_int_t nxt_memcasecmp(const void *p1, const void *p2, size_t length); -NXT_EXPORT u_char *nxt_memstrn(const u_char *s, const u_char *end, +NXT_EXPORT char *nxt_memstrn(const char *s, const char *end, const char *ss, size_t length); -NXT_EXPORT u_char *nxt_memcasestrn(const u_char *s, const u_char *end, +NXT_EXPORT char *nxt_memcasestrn(const char *s, const char *end, const char *ss, size_t length); -NXT_EXPORT u_char *nxt_rmemstrn(const u_char *s, const u_char *end, +NXT_EXPORT char *nxt_rmemstrn(const char *s, const char *end, const char *ss, size_t length); -NXT_EXPORT size_t nxt_str_strip(const u_char *start, u_char *end); +NXT_EXPORT size_t nxt_str_strip(const char *start, char *end); typedef struct { size_t length; - u_char *start; + char *start; } nxt_str_t; -#define nxt_string(str) { nxt_length(str), (u_char *) str } -#define nxt_string_zero(str) { sizeof(str), (u_char *) str } +#define nxt_string(str) { nxt_length(str), (char *) str } +#define nxt_string_zero(str) { sizeof(str), (char *) str } #define nxt_null_string { 0, NULL } #define nxt_str_set(str, text) \ do { \ (str)->length = nxt_length(text); \ - (str)->start = (u_char *) text; \ + (str)->start = (char *) text; \ } while (0) @@ -148,18 +148,18 @@ NXT_EXPORT char *nxt_str_cstrz(nxt_mp_t *mp, const nxt_str_t *src); (((s)->length != 0) && ((s)->start[0] == c)) -NXT_EXPORT nxt_int_t nxt_strverscmp(const u_char *s1, const u_char *s2); -NXT_EXPORT nxt_bool_t nxt_strvers_match(u_char *version, u_char *prefix, +NXT_EXPORT nxt_int_t nxt_strverscmp(const char *s1, const char *s2); +NXT_EXPORT nxt_bool_t nxt_strvers_match(char *version, char *prefix, size_t length); -NXT_EXPORT u_char *nxt_decode_uri(u_char *dst, u_char *src, size_t length); -NXT_EXPORT u_char *nxt_decode_uri_plus(u_char *dst, u_char *src, size_t length); -NXT_EXPORT uintptr_t nxt_encode_uri(u_char *dst, u_char *src, size_t length); -NXT_EXPORT uintptr_t nxt_encode_complex_uri(u_char *dst, u_char *src, +NXT_EXPORT char *nxt_decode_uri(char *dst, char *src, size_t length); +NXT_EXPORT char *nxt_decode_uri_plus(char *dst, char *src, size_t length); +NXT_EXPORT uintptr_t nxt_encode_uri(char *dst, char *src, size_t length); +NXT_EXPORT uintptr_t nxt_encode_complex_uri(char *dst, char *src, size_t length); -NXT_EXPORT nxt_bool_t nxt_is_complex_uri_encoded(u_char *s, size_t length); +NXT_EXPORT nxt_bool_t nxt_is_complex_uri_encoded(char *s, size_t length); -NXT_EXPORT ssize_t nxt_base64_decode(u_char *dst, u_char *src, size_t length); +NXT_EXPORT ssize_t nxt_base64_decode(char *dst, char *src, size_t length); extern const uint8_t nxt_hex2int[256]; diff --git a/src/nxt_thread_time.c b/src/nxt_thread_time.c index d084af0af..128504ac5 100644 --- a/src/nxt_thread_time.c +++ b/src/nxt_thread_time.c @@ -34,8 +34,8 @@ static void nxt_time_thread(void *data); static void nxt_thread_time_shared(nxt_monotonic_time_t *now); static void nxt_thread_realtime_update(nxt_thread_t *thr, nxt_monotonic_time_t *now); -static u_char *nxt_thread_time_string_no_cache(nxt_thread_t *thr, - nxt_time_string_t *ts, u_char *buf); +static char *nxt_thread_time_string_no_cache(nxt_thread_t *thr, + nxt_time_string_t *ts, char *buf); static nxt_atomic_uint_t nxt_thread_time_string_slot(nxt_time_string_t *ts); static nxt_time_string_cache_t *nxt_thread_time_string_cache(nxt_thread_t *thr, nxt_atomic_uint_t slot); @@ -222,10 +222,10 @@ nxt_thread_realtime_update(nxt_thread_t *thr, nxt_monotonic_time_t *now) } -u_char * -nxt_thread_time_string(nxt_thread_t *thr, nxt_time_string_t *ts, u_char *buf) +char * +nxt_thread_time_string(nxt_thread_t *thr, nxt_time_string_t *ts, char *buf) { - u_char *p; + char *p; struct tm *tm; nxt_time_t s; nxt_bool_t update; @@ -347,9 +347,9 @@ nxt_thread_time_string(nxt_thread_t *thr, nxt_time_string_t *ts, u_char *buf) } -static u_char * +static char * nxt_thread_time_string_no_cache(nxt_thread_t *thr, nxt_time_string_t *ts, - u_char *buf) + char *buf) { struct tm tm; nxt_realtime_t now; diff --git a/src/nxt_thread_time.h b/src/nxt_thread_time.h index 77eaea493..3846b5d1b 100644 --- a/src/nxt_thread_time.h +++ b/src/nxt_thread_time.h @@ -17,7 +17,7 @@ typedef struct { nxt_atomic_t slot; - u_char *(*handler)(u_char *buf, nxt_realtime_t *now, + char *(*handler)(char *buf, nxt_realtime_t *now, struct tm *tm, size_t size, const char *format); const char *format; @@ -65,8 +65,8 @@ NXT_EXPORT void nxt_thread_time_update(nxt_thread_t *thr); void nxt_thread_time_free(nxt_thread_t *thr); NXT_EXPORT nxt_time_t nxt_thread_time(nxt_thread_t *thr); NXT_EXPORT nxt_realtime_t *nxt_thread_realtime(nxt_thread_t *thr); -NXT_EXPORT u_char *nxt_thread_time_string(nxt_thread_t *thr, - nxt_time_string_t *ts, u_char *buf); +NXT_EXPORT char *nxt_thread_time_string(nxt_thread_t *thr, + nxt_time_string_t *ts, char *buf); void nxt_time_thread_start(nxt_msec_t interval); diff --git a/src/nxt_time_parse.c b/src/nxt_time_parse.c index 63620b09b..5cf69b1dd 100644 --- a/src/nxt_time_parse.c +++ b/src/nxt_time_parse.c @@ -13,14 +13,14 @@ */ nxt_time_t -nxt_time_parse(const u_char *p, size_t len) +nxt_time_parse(const char *p, size_t len) { size_t n; - u_char c; + char c; uint64_t s; nxt_int_t yr, month, day, hour, min, sec; nxt_uint_t year, days; - const u_char *end; + const char *end; static const nxt_int_t mday[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 @@ -308,11 +308,11 @@ nxt_time_parse(const u_char *p, size_t len) */ nxt_int_t -nxt_term_parse(const u_char *p, size_t len, nxt_bool_t seconds) +nxt_term_parse(const char *p, size_t len, nxt_bool_t seconds) { - u_char c, ch; + char c, ch; nxt_uint_t val, term, scale, max; - const u_char *end; + const char *end; enum { st_first_digit = 0, diff --git a/src/nxt_tls.h b/src/nxt_tls.h index 0667ade3c..f3fb08e25 100644 --- a/src/nxt_tls.h +++ b/src/nxt_tls.h @@ -97,7 +97,7 @@ extern const nxt_tls_lib_t nxt_openssl_lib; void nxt_cdecl nxt_openssl_log_error(nxt_task_t *task, nxt_uint_t level, const char *fmt, ...); -u_char *nxt_openssl_copy_error(u_char *p, u_char *end); +char *nxt_openssl_copy_error(char *p, char *end); #endif #if (NXT_HAVE_GNUTLS) diff --git a/src/nxt_tstr.c b/src/nxt_tstr.c index 50df4c475..5e4d16522 100644 --- a/src/nxt_tstr.c +++ b/src/nxt_tstr.c @@ -78,7 +78,7 @@ nxt_tstr_t * nxt_tstr_compile(nxt_tstr_state_t *state, const nxt_str_t *str, nxt_tstr_flags_t flags) { - u_char *p; + char *p; nxt_tstr_t *tstr; nxt_bool_t strz; @@ -142,9 +142,9 @@ nxt_tstr_compile(nxt_tstr_state_t *state, const nxt_str_t *str, nxt_int_t -nxt_tstr_test(nxt_tstr_state_t *state, nxt_str_t *str, u_char *error) +nxt_tstr_test(nxt_tstr_state_t *state, nxt_str_t *str, char *error) { - u_char *p; + char *p; if (nxt_tstr_is_js(str)) { #if (NXT_HAVE_NJS) @@ -170,7 +170,7 @@ nxt_tstr_test(nxt_tstr_state_t *state, nxt_str_t *str, u_char *error) nxt_int_t -nxt_tstr_state_done(nxt_tstr_state_t *state, u_char *error) +nxt_tstr_state_done(nxt_tstr_state_t *state, char *error) { #if (NXT_HAVE_NJS) if (!state->test) { diff --git a/src/nxt_tstr.h b/src/nxt_tstr.h index aca74e20c..c0070b0a2 100644 --- a/src/nxt_tstr.h +++ b/src/nxt_tstr.h @@ -46,8 +46,8 @@ typedef struct { nxt_tstr_state_t *nxt_tstr_state_new(nxt_mp_t *mp, nxt_bool_t test); nxt_tstr_t *nxt_tstr_compile(nxt_tstr_state_t *state, const nxt_str_t *str, nxt_tstr_flags_t flags); -nxt_int_t nxt_tstr_test(nxt_tstr_state_t *state, nxt_str_t *str, u_char *error); -nxt_int_t nxt_tstr_state_done(nxt_tstr_state_t *state, u_char *error); +nxt_int_t nxt_tstr_test(nxt_tstr_state_t *state, nxt_str_t *str, char *error); +nxt_int_t nxt_tstr_state_done(nxt_tstr_state_t *state, char *error); void nxt_tstr_state_release(nxt_tstr_state_t *state); nxt_int_t nxt_tstr_cond_compile(nxt_tstr_state_t *state, nxt_str_t *str, nxt_tstr_cond_t *cond); @@ -66,7 +66,7 @@ void nxt_tstr_query_release(nxt_tstr_query_t *query); nxt_inline nxt_bool_t nxt_is_tstr(nxt_str_t *str) { - u_char *p; + char *p; p = memchr(str->start, '`', str->length); if (p != NULL) { diff --git a/src/nxt_unit.c b/src/nxt_unit.c index 966a6c0fa..051e9150b 100644 --- a/src/nxt_unit.c +++ b/src/nxt_unit.c @@ -1922,7 +1922,7 @@ nxt_unit_websocket_frame_free(nxt_unit_ctx_t *ctx, uint16_t nxt_unit_field_hash(const char *name, size_t name_length) { - u_char ch; + char ch; uint32_t hash; const char *p, *end; @@ -2635,7 +2635,7 @@ nxt_unit_mmap_buf_send(nxt_unit_request_info_t *req, } m; int rc; - u_char *last_used, *first_free; + char *last_used, *first_free; ssize_t res; nxt_chunk_id_t first_free_chunk; nxt_unit_buf_t *buf; @@ -2665,7 +2665,7 @@ nxt_unit_mmap_buf_send(nxt_unit_request_info_t *req, if (m.msg.mmap) { m.mmap_msg.mmap_id = hdr->id; m.mmap_msg.chunk_id = nxt_port_mmap_chunk_id(hdr, - (u_char *) buf->start); + (char *) buf->start); nxt_unit_debug(req->ctx, "#%"PRIu32": send mmap: (%d,%d,%d)", req_impl->stream, @@ -2679,7 +2679,7 @@ nxt_unit_mmap_buf_send(nxt_unit_request_info_t *req, goto free_buf; } - last_used = (u_char *) buf->free - 1; + last_used = (char *) buf->free - 1; first_free_chunk = nxt_port_mmap_chunk_id(hdr, last_used) + 1; if (buf->end - buf->free >= PORT_MMAP_CHUNK_SIZE) { @@ -3212,7 +3212,7 @@ nxt_unit_request_preread(nxt_unit_request_info_t *req, size_t size) static ssize_t nxt_unit_buf_read(nxt_unit_buf_t **b, uint64_t *len, void *dst, size_t size) { - u_char *p; + char *p; size_t rest, copy, read; nxt_unit_buf_t *buf, *last_buf; @@ -4351,7 +4351,7 @@ nxt_unit_mmap_release(nxt_unit_ctx_t *ctx, nxt_port_mmap_header_t *hdr, void *start, uint32_t size) { int freed_chunks; - u_char *p, *end; + char *p, *end; nxt_chunk_id_t c; nxt_unit_impl_t *lib; @@ -4445,7 +4445,7 @@ nxt_unit_process_lhq_pid(nxt_lvlhsh_query_t *lhq, pid_t *pid) { lhq->key_hash = nxt_murmur_hash2(pid, sizeof(*pid)); lhq->key.length = sizeof(*pid); - lhq->key.start = (u_char *) pid; + lhq->key.start = (char *) pid; lhq->proto = &lvlhsh_processes_proto; } @@ -6416,7 +6416,7 @@ nxt_unit_port_hash_lhq(nxt_lvlhsh_query_t *lhq, } lhq->key.length = sizeof(nxt_unit_port_hash_id_t); - lhq->key.start = (u_char *) port_hash_id; + lhq->key.start = (char *) port_hash_id; lhq->proto = &lvlhsh_ports_proto; lhq->pool = NULL; } @@ -6512,7 +6512,7 @@ nxt_unit_request_hash_add(nxt_unit_ctx_t *ctx, lhq.key_hash = nxt_murmur_hash2(stream, sizeof(*stream)); lhq.key.length = sizeof(*stream); - lhq.key.start = (u_char *) stream; + lhq.key.start = (char *) stream; lhq.proto = &lvlhsh_requests_proto; lhq.pool = NULL; lhq.replace = 0; @@ -6548,7 +6548,7 @@ nxt_unit_request_hash_find(nxt_unit_ctx_t *ctx, uint32_t stream, int remove) lhq.key_hash = nxt_murmur_hash2(&stream, sizeof(stream)); lhq.key.length = sizeof(stream); - lhq.key.start = (u_char *) &stream; + lhq.key.start = (char *) &stream; lhq.proto = &lvlhsh_requests_proto; lhq.pool = NULL; @@ -6783,9 +6783,9 @@ nxt_unit_free(nxt_unit_ctx_t *ctx, void *p) static int nxt_unit_memcasecmp(const void *p1, const void *p2, size_t length) { - u_char c1, c2; + char c1, c2; nxt_int_t n; - const u_char *s1, *s2; + const char *s1, *s2; s1 = p1; s2 = p2; diff --git a/src/nxt_utf8.c b/src/nxt_utf8.c index d983be841..84089e823 100644 --- a/src/nxt_utf8.c +++ b/src/nxt_utf8.c @@ -30,8 +30,8 @@ #endif -u_char * -nxt_utf8_encode(u_char *p, uint32_t u) +char * +nxt_utf8_encode(char *p, uint32_t u) { if (u < 0x80) { *p++ = (u_char) (u & 0xFF); @@ -70,7 +70,7 @@ nxt_utf8_encode(u_char *p, uint32_t u) */ uint32_t -nxt_utf8_decode(const u_char **start, const u_char *end) +nxt_utf8_decode(const char **start, const char *end) { uint32_t u; @@ -92,12 +92,12 @@ nxt_utf8_decode(const u_char **start, const u_char *end) */ uint32_t -nxt_utf8_decode2(const u_char **start, const u_char *end) +nxt_utf8_decode2(const char **start, const char *end) { - u_char c; + char c; size_t n; uint32_t u, overlong; - const u_char *p; + const char *p; p = *start; u = (uint32_t) *p; @@ -175,12 +175,12 @@ nxt_utf8_decode2(const u_char **start, const u_char *end) */ nxt_int_t -nxt_utf8_casecmp(const u_char *start1, const u_char *start2, size_t len1, +nxt_utf8_casecmp(const char *start1, const char *start2, size_t len1, size_t len2) { int32_t n; uint32_t u1, u2; - const u_char *end1, *end2; + const char *end1, *end2; end1 = start1 + len1; end2 = start2 + len2; @@ -207,7 +207,7 @@ nxt_utf8_casecmp(const u_char *start1, const u_char *start2, size_t len1, uint32_t -nxt_utf8_lowcase(const u_char **start, const u_char *end) +nxt_utf8_lowcase(const char **start, const char *end) { uint32_t u; const uint32_t *block; @@ -235,10 +235,10 @@ nxt_utf8_lowcase(const u_char **start, const u_char *end) ssize_t -nxt_utf8_length(const u_char *p, size_t len) +nxt_utf8_length(const char *p, size_t len) { ssize_t length; - const u_char *end; + const char *end; length = 0; @@ -257,9 +257,9 @@ nxt_utf8_length(const u_char *p, size_t len) nxt_bool_t -nxt_utf8_is_valid(const u_char *p, size_t len) +nxt_utf8_is_valid(const char *p, size_t len) { - const u_char *end; + const char *end; end = p + len; diff --git a/src/nxt_utf8.h b/src/nxt_utf8.h index 13f42e16a..2275459cc 100644 --- a/src/nxt_utf8.h +++ b/src/nxt_utf8.h @@ -16,22 +16,22 @@ #define NXT_UTF8_SORT_INVALID 0x0EEE0EEE -NXT_EXPORT u_char *nxt_utf8_encode(u_char *p, uint32_t u); -NXT_EXPORT uint32_t nxt_utf8_decode(const u_char **start, const u_char *end); -NXT_EXPORT uint32_t nxt_utf8_decode2(const u_char **start, const u_char *end); -NXT_EXPORT nxt_int_t nxt_utf8_casecmp(const u_char *start1, - const u_char *start2, size_t len1, size_t len2); -NXT_EXPORT uint32_t nxt_utf8_lowcase(const u_char **start, const u_char *end); -NXT_EXPORT ssize_t nxt_utf8_length(const u_char *p, size_t len); -NXT_EXPORT nxt_bool_t nxt_utf8_is_valid(const u_char *p, size_t len); +NXT_EXPORT char *nxt_utf8_encode(char *p, uint32_t u); +NXT_EXPORT uint32_t nxt_utf8_decode(const char **start, const char *end); +NXT_EXPORT uint32_t nxt_utf8_decode2(const char **start, const char *end); +NXT_EXPORT nxt_int_t nxt_utf8_casecmp(const char *start1, + const char *start2, size_t len1, size_t len2); +NXT_EXPORT uint32_t nxt_utf8_lowcase(const char **start, const char *end); +NXT_EXPORT ssize_t nxt_utf8_length(const char *p, size_t len); +NXT_EXPORT nxt_bool_t nxt_utf8_is_valid(const char *p, size_t len); /* nxt_utf8_next() expects a valid UTF-8 string. */ -nxt_inline const u_char * -nxt_utf8_next(const u_char *p, const u_char *end) +nxt_inline const char * +nxt_utf8_next(const char *p, const char *end) { - u_char c; + char c; c = *p++; diff --git a/src/nxt_var.c b/src/nxt_var.c index 16aa1c7ed..930937d58 100644 --- a/src/nxt_var.c +++ b/src/nxt_var.c @@ -9,11 +9,11 @@ struct nxt_var_s { size_t length; nxt_uint_t vars; - u_char data[]; + char data[]; /* nxt_var_sub_t subs[vars]; - u_char raw[length]; + char raw[length]; */ }; @@ -51,7 +51,7 @@ static nxt_int_t nxt_var_cache_test(nxt_lvlhsh_query_t *lhq, void *data); static nxt_str_t *nxt_var_cache_value(nxt_task_t *task, nxt_tstr_state_t *state, nxt_var_cache_t *cache, nxt_var_ref_t *ref, void *ctx); -static u_char *nxt_var_next_part(u_char *start, u_char *end, nxt_str_t *part); +static char *nxt_var_next_part(char *start, char *end, nxt_str_t *part); static const nxt_lvlhsh_proto_t nxt_var_hash_proto nxt_aligned(64) = { @@ -234,7 +234,7 @@ nxt_var_cache_value(nxt_task_t *task, nxt_tstr_state_t *state, lhq.key_hash = nxt_murmur_hash2_uint32(&ref->index); lhq.replace = 0; lhq.key.length = sizeof(uint32_t); - lhq.key.start = (u_char *) &ref->index; + lhq.key.start = (char *) &ref->index; lhq.value = value; lhq.proto = &nxt_var_cache_proto; lhq.pool = cache->pool; @@ -314,7 +314,7 @@ nxt_var_index_init(void) nxt_var_t * nxt_var_compile(nxt_tstr_state_t *state, nxt_str_t *str) { - u_char *p, *end, *next, *src; + char *p, *end, *next, *src; size_t size; nxt_var_t *var; nxt_str_t part; @@ -380,9 +380,9 @@ nxt_var_compile(nxt_tstr_state_t *state, nxt_str_t *str) nxt_int_t -nxt_var_test(nxt_tstr_state_t *state, nxt_str_t *str, u_char *error) +nxt_var_test(nxt_tstr_state_t *state, nxt_str_t *str, char *error) { - u_char *p, *end, *next; + char *p, *end, *next; nxt_str_t part; nxt_var_ref_t *ref; @@ -417,11 +417,11 @@ nxt_var_test(nxt_tstr_state_t *state, nxt_str_t *str, u_char *error) } -static u_char * -nxt_var_next_part(u_char *start, u_char *end, nxt_str_t *part) +static char * +nxt_var_next_part(char *start, char *end, nxt_str_t *part) { size_t length; - u_char *p, ch, c; + char *p, ch, c; nxt_bool_t bracket; p = memchr(start, '$', end - start); @@ -492,7 +492,7 @@ nxt_var_interpreter(nxt_task_t *task, nxt_tstr_state_t *state, nxt_var_cache_t *cache, nxt_var_t *var, nxt_str_t *str, void *ctx, nxt_bool_t logging) { - u_char *p, *src; + char *p, *src; size_t length, last, next; uint32_t index; nxt_str_t *value, **part; diff --git a/src/nxt_var.h b/src/nxt_var.h index 08a92c08a..b76da03ed 100644 --- a/src/nxt_var.h +++ b/src/nxt_var.h @@ -54,7 +54,7 @@ nxt_var_field_t *nxt_var_field_new(nxt_mp_t *mp, nxt_str_t *name, uint32_t hash); nxt_var_t *nxt_var_compile(nxt_tstr_state_t *state, nxt_str_t *str); -nxt_int_t nxt_var_test(nxt_tstr_state_t *state, nxt_str_t *str, u_char *error); +nxt_int_t nxt_var_test(nxt_tstr_state_t *state, nxt_str_t *str, char *error); nxt_int_t nxt_var_interpreter(nxt_task_t *task, nxt_tstr_state_t *state, nxt_var_cache_t *cache, nxt_var_t *var, nxt_str_t *str, void *ctx, diff --git a/src/nxt_websocket.h b/src/nxt_websocket.h index 499a3268c..7452f142a 100644 --- a/src/nxt_websocket.h +++ b/src/nxt_websocket.h @@ -15,7 +15,7 @@ enum { NXT_EXPORT size_t nxt_websocket_frame_header_size(const void *data); NXT_EXPORT uint64_t nxt_websocket_frame_payload_len(const void *data); NXT_EXPORT void *nxt_websocket_frame_init(void *data, uint64_t payload_len); -NXT_EXPORT void nxt_websocket_accept(u_char *accept, const void *key); +NXT_EXPORT void nxt_websocket_accept(char *accept, const void *key); #endif /* _NXT_WEBSOCKET_H_INCLUDED_ */ diff --git a/src/nxt_websocket_accept.c b/src/nxt_websocket_accept.c index 0e2cef588..5bce11f13 100644 --- a/src/nxt_websocket_accept.c +++ b/src/nxt_websocket_accept.c @@ -9,10 +9,10 @@ static void -nxt_websocket_base64_encode(u_char *d, const uint8_t *s, size_t len) +nxt_websocket_base64_encode(char *d, const uint8_t *s, size_t len) { - u_char c0, c1, c2; - static const u_char basis[] = + char c0, c1, c2; + static const char basis[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; while (len > 2) { @@ -51,9 +51,9 @@ nxt_websocket_base64_encode(u_char *d, const uint8_t *s, size_t len) void -nxt_websocket_accept(u_char *accept, const void *key) +nxt_websocket_accept(char *accept, const void *key) { - u_char bin_accept[20]; + char bin_accept[20]; nxt_sha1_t ctx; static const char accept_guid[] = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";