# HG changeset patch # User Igor Sysoev # Date 1240583256 0 # Node ID ccaf43725ff6098c53d2165057634ecbccb19f15 # Parent 2477b28eaccbdddc13529c83a9a30005f2223aa9 change ngx_log_create_errlog() interface diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c --- a/src/core/ngx_log.c +++ b/src/core/ngx_log.c @@ -303,18 +303,9 @@ ngx_log_init(void) ngx_log_t * -ngx_log_create_errlog(ngx_cycle_t *cycle, ngx_array_t *args) +ngx_log_create_errlog(ngx_cycle_t *cycle, ngx_str_t *name) { ngx_log_t *log; - ngx_str_t *value, *name; - - if (args) { - value = args->elts; - name = &value[1]; - - } else { - name = NULL; - } log = ngx_pcalloc(cycle->pool, sizeof(ngx_log_t)); if (log == NULL) { diff --git a/src/core/ngx_log.h b/src/core/ngx_log.h --- a/src/core/ngx_log.h +++ b/src/core/ngx_log.h @@ -196,7 +196,7 @@ void ngx_cdecl ngx_log_debug_core(ngx_lo /*********************************/ ngx_log_t *ngx_log_init(void); -ngx_log_t *ngx_log_create_errlog(ngx_cycle_t *cycle, ngx_array_t *args); +ngx_log_t *ngx_log_create_errlog(ngx_cycle_t *cycle, ngx_str_t *name); char *ngx_set_error_log_levels(ngx_conf_t *cf, ngx_log_t *log); void ngx_log_abort(ngx_err_t err, const char *text, void *param); void ngx_cdecl ngx_log_stderr(ngx_err_t err, const char *fmt, ...); diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -4101,7 +4101,11 @@ ngx_http_core_error_log(ngx_conf_t *cf, { ngx_http_core_loc_conf_t *lcf = conf; - lcf->err_log = ngx_log_create_errlog(cf->cycle, cf->args); + ngx_str_t *value; + + value = cf->args->elts; + + lcf->err_log = ngx_log_create_errlog(cf->cycle, &value[1]); if (lcf->err_log == NULL) { return NGX_CONF_ERROR; }