details: http://hg.nginx.org/nginx/rev/577628e6b6a6
branches:
changeset: 7086:577628e6b6a6
user: Sergey Kandaurov <pluknet@nginx.com>
date: Wed Aug 09 14:59:46 2017 +0300
description:
Style.

diffstat:

src/core/ngx_conf_file.c | 1 +
src/event/ngx_event_openssl.c | 2 ++
src/http/modules/ngx_http_geo_module.c | 1 +
src/os/unix/ngx_files.c | 1 +
src/os/win32/ngx_files.c | 1 +
src/stream/ngx_stream_geo_module.c | 1 +
6 files changed, 7 insertions(+), 0 deletions(-)

diffs (74 lines):

diff -r 2284008a2791 -r 577628e6b6a6 src/core/ngx_conf_file.c
--- a/src/core/ngx_conf_file.c Wed Aug 09 14:59:44 2017 +0300
+++ b/src/core/ngx_conf_file.c Wed Aug 09 14:59:46 2017 +0300
@@ -178,6 +178,7 @@ ngx_conf_parse(ngx_conf_t *cf, ngx_str_t
/* open configuration file */

fd = ngx_open_file(filename->data, NGX_FILE_RDONLY, NGX_FILE_OPEN, 0);
+
if (fd == NGX_INVALID_FILE) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
ngx_open_file_n " \"%s\" failed",
diff -r 2284008a2791 -r 577628e6b6a6 src/event/ngx_event_openssl.c
--- a/src/event/ngx_event_openssl.c Wed Aug 09 14:59:44 2017 +0300
+++ b/src/event/ngx_event_openssl.c Wed Aug 09 14:59:46 2017 +0300
@@ -924,6 +924,7 @@ ngx_ssl_read_password_file(ngx_conf_t *c
cln->data = passwords;

fd = ngx_open_file(file->data, NGX_FILE_RDONLY, NGX_FILE_OPEN, 0);
+
if (fd == NGX_INVALID_FILE) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
ngx_open_file_n " \"%s\" failed", file->data);
@@ -2906,6 +2907,7 @@ ngx_ssl_session_ticket_keys(ngx_conf_t *
file.log = cf->log;

file.fd = ngx_open_file(file.name.data, NGX_FILE_RDONLY, 0, 0);
+
if (file.fd == NGX_INVALID_FILE) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, ngx_errno,
ngx_open_file_n " \"%V\" failed", &file.name);
diff -r 2284008a2791 -r 577628e6b6a6 src/http/modules/ngx_http_geo_module.c
--- a/src/http/modules/ngx_http_geo_module.c Wed Aug 09 14:59:44 2017 +0300
+++ b/src/http/modules/ngx_http_geo_module.c Wed Aug 09 14:59:46 2017 +0300
@@ -1401,6 +1401,7 @@ ngx_http_geo_include_binary_base(ngx_con
file.log = cf->log;

file.fd = ngx_open_file(name->data, NGX_FILE_RDONLY, 0, 0);
+
if (file.fd == NGX_INVALID_FILE) {
err = ngx_errno;
if (err != NGX_ENOENT) {
diff -r 2284008a2791 -r 577628e6b6a6 src/os/unix/ngx_files.c
--- a/src/os/unix/ngx_files.c Wed Aug 09 14:59:44 2017 +0300
+++ b/src/os/unix/ngx_files.c Wed Aug 09 14:59:46 2017 +0300
@@ -620,6 +620,7 @@ ngx_create_file_mapping(ngx_file_mapping
{
fm->fd = ngx_open_file(fm->name, NGX_FILE_RDWR, NGX_FILE_TRUNCATE,
NGX_FILE_DEFAULT_ACCESS);
+
if (fm->fd == NGX_INVALID_FILE) {
ngx_log_error(NGX_LOG_CRIT, fm->log, ngx_errno,
ngx_open_file_n " \"%s\" failed", fm->name);
diff -r 2284008a2791 -r 577628e6b6a6 src/os/win32/ngx_files.c
--- a/src/os/win32/ngx_files.c Wed Aug 09 14:59:44 2017 +0300
+++ b/src/os/win32/ngx_files.c Wed Aug 09 14:59:46 2017 +0300
@@ -330,6 +330,7 @@ ngx_create_file_mapping(ngx_file_mapping

fm->fd = ngx_open_file(fm->name, NGX_FILE_RDWR, NGX_FILE_TRUNCATE,
NGX_FILE_DEFAULT_ACCESS);
+
if (fm->fd == NGX_INVALID_FILE) {
ngx_log_error(NGX_LOG_CRIT, fm->log, ngx_errno,
ngx_open_file_n " \"%s\" failed", fm->name);
diff -r 2284008a2791 -r 577628e6b6a6 src/stream/ngx_stream_geo_module.c
--- a/src/stream/ngx_stream_geo_module.c Wed Aug 09 14:59:44 2017 +0300
+++ b/src/stream/ngx_stream_geo_module.c Wed Aug 09 14:59:46 2017 +0300
@@ -1327,6 +1327,7 @@ ngx_stream_geo_include_binary_base(ngx_c
file.log = cf->log;

file.fd = ngx_open_file(name->data, NGX_FILE_RDONLY, 0, 0);
+
if (file.fd == NGX_INVALID_FILE) {
err = ngx_errno;
if (err != NGX_ENOENT) {
_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel