From 4b96baa417874ce7c152f40787d1d41a4f070690 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Sat, 15 Sep 2007 17:11:06 +0000 Subject: [PATCH] u_char* is enough to keep file name --- src/http/ngx_http.c | 4 ++-- src/http/ngx_http_core_module.c | 2 +- src/http/ngx_http_core_module.h | 4 ++-- src/http/ngx_http_upstream.c | 4 ++-- src/http/ngx_http_upstream.h | 2 +- src/http/ngx_http_upstream_round_robin.c | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index 97a2c193c..59b43d054 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -553,8 +553,8 @@ ngx_http_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) if (in_addr[a].default_server) { ngx_log_error(NGX_LOG_ERR, cf->log, 0, - "the duplicate default server in %V:%d", - &lscf[l].file_name, lscf[l].line); + "the duplicate default server in %s:%ui", + &lscf[l].file_name, lscf[l].line); return NGX_CONF_ERROR; } diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index b25346daa..f93c6a28c 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -2627,7 +2627,7 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) ls->family = AF_INET; ls->addr = u.addr.in_addr; ls->port = u.port; - ls->file_name = cf->conf_file->file.name; + ls->file_name = cf->conf_file->file.name.data; ls->line = cf->conf_file->line; ls->conf.backlog = NGX_LISTEN_BACKLOG; ls->conf.rcvbuf = -1; diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h index 2bd687e88..c56e09bc2 100644 --- a/src/http/ngx_http_core_module.h +++ b/src/http/ngx_http_core_module.h @@ -38,8 +38,8 @@ typedef struct { in_port_t port; int family; - ngx_str_t file_name; - ngx_int_t line; + u_char *file_name; + ngx_uint_t line; ngx_http_listen_conf_t conf; } ngx_http_listen_t; diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index ae5f3d3e8..878ca42b3 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -3223,7 +3223,7 @@ ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags) ngx_log_error(NGX_LOG_WARN, cf->log, 0, "upstream \"%V\" may not have port %d in %s:%ui", &u->host, uscfp[i]->port, - uscfp[i]->file_name.data, uscfp[i]->line); + uscfp[i]->file_name, uscfp[i]->line); return NULL; } @@ -3247,7 +3247,7 @@ ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags) uscf->flags = flags; uscf->host = u->host; - uscf->file_name = cf->conf_file->file.name; + uscf->file_name = cf->conf_file->file.name.data; uscf->line = cf->conf_file->line; uscf->port = u->port; uscf->default_port = u->default_port; diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h index 5c77be39c..de1a2c88f 100644 --- a/src/http/ngx_http_upstream.h +++ b/src/http/ngx_http_upstream.h @@ -92,7 +92,7 @@ struct ngx_http_upstream_srv_conf_s { ngx_uint_t flags; ngx_str_t host; - ngx_str_t file_name; + u_char *file_name; ngx_uint_t line; in_port_t port; in_port_t default_port; diff --git a/src/http/ngx_http_upstream_round_robin.c b/src/http/ngx_http_upstream_round_robin.c index d0911a04f..43c2a50f1 100644 --- a/src/http/ngx_http_upstream_round_robin.c +++ b/src/http/ngx_http_upstream_round_robin.c @@ -136,7 +136,7 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf, if (us->port == 0 && us->default_port == 0) { ngx_log_error(NGX_LOG_EMERG, cf->log, 0, "no port in upstream \"%V\" in %s:%ui", - &us->host, us->file_name.data, us->line); + &us->host, us->file_name, us->line); return NGX_ERROR; } @@ -149,7 +149,7 @@ ngx_http_upstream_init_round_robin(ngx_conf_t *cf, if (u.err) { ngx_log_error(NGX_LOG_EMERG, cf->log, 0, "%s in upstream \"%V\" in %s:%ui", - u.err, &us->host, us->file_name.data, us->line); + u.err, &us->host, us->file_name, us->line); } return NGX_ERROR;