Mercurial > hg > nginx

diff src/core/ngx_conf_file.c @ 5331:e04083b79335

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Style improved after 12dd27b74117.
author Maxim Dounin <mdounin@mdounin.ru>
date Tue, 20 Aug 2013 21:33:43 +0400
parents 314c3d7cc3a5
children 56ad171c3dd1
line wrap: on
line diff
--- a/src/core/ngx_conf_file.c
+++ b/src/core/ngx_conf_file.c
@@ -800,10 +800,11 @@ ngx_conf_include(ngx_conf_t *cf, ngx_com
 ngx_int_t
 ngx_conf_full_name(ngx_cycle_t *cycle, ngx_str_t *name, ngx_uint_t conf_prefix)
 {
-    return ngx_get_full_name(cycle->pool,
-                             conf_prefix ? &cycle->conf_prefix:
-                                           &cycle->prefix,
-                             name);
+    ngx_str_t  *prefix;
+
+    prefix = conf_prefix ? &cycle->conf_prefix : &cycle->prefix;
+
+    return ngx_get_full_name(cycle->pool, prefix, name);
 }