Style fixes.

This commit is contained in:
Igor Sysoev
2017-09-25 18:04:11 +03:00
parent 2ae0449262
commit 6b0a3aed22
2 changed files with 10 additions and 9 deletions

View File

@@ -7,12 +7,12 @@ cat << END
Configuration summary:
unit pid file: "$NXT_PID"
unit log file: "$NXT_LOG"
unit modules path: "$NXT_MODULES"
unit state path: "$NXT_STATE"
unit pid file: "$NXT_PID"
unit log file: "$NXT_LOG"
unit modules path: "$NXT_MODULES"
unit state path: "$NXT_STATE"
unit control API socket: "$NXT_CONTROL"
unit control API socket: "$NXT_CONTROL"
non-privileged user: "$NXT_USER"
non-privileged group: "$NXT_GROUP"

View File

@@ -322,11 +322,12 @@ nxt_main_start_controller_process(nxt_task_t *task, nxt_runtime_t *rt)
file.name = (nxt_file_name_t *) rt->conf;
if (nxt_file_open(task, &file, NXT_FILE_RDONLY, NXT_FILE_OPEN, 0) == NXT_OK) {
ret = nxt_file_open(task, &file, NXT_FILE_RDONLY, NXT_FILE_OPEN, 0);
if (nxt_fast_path(nxt_file_info(&file, &fi) == NXT_OK
&& nxt_is_file(&fi)))
{
if (ret == NXT_OK) {
ret = nxt_file_info(&file, &fi);
if (nxt_fast_path(ret == NXT_OK && nxt_is_file(&fi))) {
conf.length = nxt_file_size(&fi);
conf.start = nxt_malloc(conf.length);