diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-12-10 12:09:51 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-12-10 12:09:51 +0000 |
| commit | 86ef6aaa6b574f2015a5094670b7123c425a63af (patch) | |
| tree | e0b78dcc48085162b29fbff2c0aeb7e5bd75c654 /src/core/nginx.c | |
| parent | e60049418525a5e605765aa2b8f9c6796eb390a6 (diff) | |
| download | nginx-86ef6aaa6b574f2015a5094670b7123c425a63af.tar.gz nginx-86ef6aaa6b574f2015a5094670b7123c425a63af.zip | |
move condition declarations inside blocks where they are used
Diffstat (limited to 'src/core/nginx.c')
| -rw-r--r-- | src/core/nginx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index ae68605ef..ee636825b 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -758,12 +758,6 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf) { ngx_core_conf_t *ccf = conf; -#if !(NGX_WIN32) - ngx_str_t lock_file; - struct group *grp; - struct passwd *pwd; -#endif - ngx_conf_init_value(ccf->daemon, 1); ngx_conf_init_value(ccf->master, 1); ngx_conf_init_msec_value(ccf->timer_resolution, 0); @@ -796,6 +790,8 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf) #if !(NGX_WIN32) if (ccf->user == (uid_t) NGX_CONF_UNSET_UINT && geteuid() == 0) { + struct group *grp; + struct passwd *pwd; ngx_set_errno(0); pwd = getpwnam(NGX_USER); @@ -848,6 +844,9 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf) return NGX_CONF_ERROR; } + { + ngx_str_t lock_file; + lock_file = cycle->old_cycle->lock_file; if (lock_file.len) { @@ -881,6 +880,7 @@ ngx_core_module_init_conf(ngx_cycle_t *cycle, void *conf) ccf->lock_file.len), ".accept", sizeof(".accept")); } + } #endif |