details: http://hg.nginx.org/nginx/rev/2cd019520210
branches:
changeset: 6474:2cd019520210
user: Ruslan Ermilov <ru@nginx.com>
date: Wed Mar 30 11:52:16 2016 +0300
description:
Style.

diffstat:

src/core/ngx_conf_file.c | 6 +-
src/core/ngx_connection.c | 36 ++++++++--------
src/core/ngx_connection.h | 22 ++++----
src/core/ngx_crypt.c | 4 +-
src/core/ngx_cycle.h | 40 +++++++++---------
src/core/ngx_file.c | 2 +-
src/core/ngx_inet.c | 20 ++++----
src/core/ngx_log.c | 18 ++++----
src/core/ngx_parse_time.c | 2 +-
src/core/ngx_slab.c | 8 +-
src/core/ngx_syslog.c | 6 +-
src/event/modules/ngx_iocp_module.c | 38 ++++++++--------
src/event/ngx_event.h | 2 +-
src/event/ngx_event_openssl.c | 6 +-
src/event/ngx_event_pipe.c | 10 ++--
src/http/modules/ngx_http_dav_module.c | 10 ++--
src/http/modules/ngx_http_fastcgi_module.c | 10 ++--
src/http/modules/ngx_http_image_filter_module.c | 2 +-
src/http/modules/ngx_http_mp4_module.c | 16 +++---
src/http/modules/ngx_http_range_filter_module.c | 2 +-
src/http/modules/ngx_http_realip_module.c | 4 +-
src/http/modules/ngx_http_referer_module.c | 2 +-
src/http/modules/ngx_http_rewrite_module.c | 2 +-
src/http/modules/ngx_http_scgi_module.c | 2 +-
src/http/modules/ngx_http_ssl_module.c | 4 +-
src/http/modules/ngx_http_upstream_least_conn_module.c | 2 +-
src/http/ngx_http_core_module.c | 36 ++++++++--------
src/http/ngx_http_core_module.h | 8 +-
src/http/ngx_http_script.c | 4 +-
src/http/ngx_http_upstream.c | 30 ++++++------
src/http/ngx_http_upstream_round_robin.c | 2 +-
src/http/v2/ngx_http_v2_module.c | 2 +-
src/mail/ngx_mail.h | 2 +-
src/mail/ngx_mail_smtp_handler.c | 2 +-
src/mail/ngx_mail_ssl_module.c | 6 +-
src/os/unix/ngx_atomic.h | 20 ++++----
src/os/unix/ngx_channel.h | 8 +-
src/os/unix/ngx_sunpro_amd64.il | 6 +-
src/os/unix/ngx_sunpro_x86.il | 6 +-
src/os/win32/ngx_atomic.h | 8 +-
src/os/win32/ngx_wsasend_chain.c | 10 ++--
src/stream/ngx_stream_upstream_least_conn_module.c | 2 +-
src/stream/ngx_stream_upstream_round_robin.c | 2 +-
43 files changed, 215 insertions(+), 215 deletions(-)

diffs (truncated from 1001 to 1000 lines):

diff -r 9d7326d3f474 -r 2cd019520210 src/core/ngx_conf_file.c
--- a/src/core/ngx_conf_file.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/core/ngx_conf_file.c Wed Mar 30 11:52:16 2016 +0300
@@ -613,9 +613,9 @@ ngx_conf_read_token(ngx_conf_t *cf)
need_space = 0;

} else {
- ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
- "unexpected \"%c\"", ch);
- return NGX_ERROR;
+ ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+ "unexpected \"%c\"", ch);
+ return NGX_ERROR;
}
}

diff -r 9d7326d3f474 -r 2cd019520210 src/core/ngx_connection.c
--- a/src/core/ngx_connection.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/core/ngx_connection.c Wed Mar 30 11:52:16 2016 +0300
@@ -47,21 +47,21 @@ ngx_create_listening(ngx_conf_t *cf, voi
switch (ls->sockaddr->sa_family) {
#if (NGX_HAVE_INET6)
case AF_INET6:
- ls->addr_text_max_len = NGX_INET6_ADDRSTRLEN;
- break;
+ ls->addr_text_max_len = NGX_INET6_ADDRSTRLEN;
+ break;
#endif
#if (NGX_HAVE_UNIX_DOMAIN)
case AF_UNIX:
- ls->addr_text_max_len = NGX_UNIX_ADDRSTRLEN;
- len++;
- break;
+ ls->addr_text_max_len = NGX_UNIX_ADDRSTRLEN;
+ len++;
+ break;
#endif
case AF_INET:
- ls->addr_text_max_len = NGX_INET_ADDRSTRLEN;
- break;
+ ls->addr_text_max_len = NGX_INET_ADDRSTRLEN;
+ break;
default:
- ls->addr_text_max_len = NGX_SOCKADDR_STRLEN;
- break;
+ ls->addr_text_max_len = NGX_SOCKADDR_STRLEN;
+ break;
}

ls->addr_text.data = ngx_pnalloc(cf->pool, len);
@@ -168,22 +168,22 @@ ngx_set_inherited_sockets(ngx_cycle_t *c

#if (NGX_HAVE_INET6)
case AF_INET6:
- ls[i].addr_text_max_len = NGX_INET6_ADDRSTRLEN;
- len = NGX_INET6_ADDRSTRLEN + sizeof("[]:65535") - 1;
- break;
+ ls[i].addr_text_max_len = NGX_INET6_ADDRSTRLEN;
+ len = NGX_INET6_ADDRSTRLEN + sizeof("[]:65535") - 1;
+ break;
#endif

#if (NGX_HAVE_UNIX_DOMAIN)
case AF_UNIX:
- ls[i].addr_text_max_len = NGX_UNIX_ADDRSTRLEN;
- len = NGX_UNIX_ADDRSTRLEN;
- break;
+ ls[i].addr_text_max_len = NGX_UNIX_ADDRSTRLEN;
+ len = NGX_UNIX_ADDRSTRLEN;
+ break;
#endif

case AF_INET:
- ls[i].addr_text_max_len = NGX_INET_ADDRSTRLEN;
- len = NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1;
- break;
+ ls[i].addr_text_max_len = NGX_INET_ADDRSTRLEN;
+ len = NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1;
+ break;

default:
ngx_log_error(NGX_LOG_CRIT, cycle->log, ngx_socket_errno,
diff -r 9d7326d3f474 -r 2cd019520210 src/core/ngx_connection.h
--- a/src/core/ngx_connection.h Wed Mar 30 11:52:07 2016 +0300
+++ b/src/core/ngx_connection.h Wed Mar 30 11:52:16 2016 +0300
@@ -95,25 +95,25 @@ struct ngx_listening_s {


typedef enum {
- NGX_ERROR_ALERT = 0,
- NGX_ERROR_ERR,
- NGX_ERROR_INFO,
- NGX_ERROR_IGNORE_ECONNRESET,
- NGX_ERROR_IGNORE_EINVAL
+ NGX_ERROR_ALERT = 0,
+ NGX_ERROR_ERR,
+ NGX_ERROR_INFO,
+ NGX_ERROR_IGNORE_ECONNRESET,
+ NGX_ERROR_IGNORE_EINVAL
} ngx_connection_log_error_e;


typedef enum {
- NGX_TCP_NODELAY_UNSET = 0,
- NGX_TCP_NODELAY_SET,
- NGX_TCP_NODELAY_DISABLED
+ NGX_TCP_NODELAY_UNSET = 0,
+ NGX_TCP_NODELAY_SET,
+ NGX_TCP_NODELAY_DISABLED
} ngx_connection_tcp_nodelay_e;


typedef enum {
- NGX_TCP_NOPUSH_UNSET = 0,
- NGX_TCP_NOPUSH_SET,
- NGX_TCP_NOPUSH_DISABLED
+ NGX_TCP_NOPUSH_UNSET = 0,
+ NGX_TCP_NOPUSH_SET,
+ NGX_TCP_NOPUSH_DISABLED
} ngx_connection_tcp_nopush_e;


diff -r 9d7326d3f474 -r 2cd019520210 src/core/ngx_crypt.c
--- a/src/core/ngx_crypt.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/core/ngx_crypt.c Wed Mar 30 11:52:16 2016 +0300
@@ -165,8 +165,8 @@ ngx_crypt_to64(u_char *p, uint32_t v, si
"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";

while (n--) {
- *p++ = itoa64[v & 0x3f];
- v >>= 6;
+ *p++ = itoa64[v & 0x3f];
+ v >>= 6;
}

return p;
diff -r 9d7326d3f474 -r 2cd019520210 src/core/ngx_cycle.h
--- a/src/core/ngx_cycle.h Wed Mar 30 11:52:07 2016 +0300
+++ b/src/core/ngx_cycle.h Wed Mar 30 11:52:16 2016 +0300
@@ -79,35 +79,35 @@ struct ngx_cycle_s {


typedef struct {
- ngx_flag_t daemon;
- ngx_flag_t master;
+ ngx_flag_t daemon;
+ ngx_flag_t master;

- ngx_msec_t timer_resolution;
+ ngx_msec_t timer_resolution;

- ngx_int_t worker_processes;
- ngx_int_t debug_points;
+ ngx_int_t worker_processes;
+ ngx_int_t debug_points;

- ngx_int_t rlimit_nofile;
- off_t rlimit_core;
+ ngx_int_t rlimit_nofile;
+ off_t rlimit_core;

- int priority;
+ int priority;

- ngx_uint_t cpu_affinity_auto;
- ngx_uint_t cpu_affinity_n;
- ngx_cpuset_t *cpu_affinity;
+ ngx_uint_t cpu_affinity_auto;
+ ngx_uint_t cpu_affinity_n;
+ ngx_cpuset_t *cpu_affinity;

- char *username;
- ngx_uid_t user;
- ngx_gid_t group;
+ char *username;
+ ngx_uid_t user;
+ ngx_gid_t group;

- ngx_str_t working_directory;
- ngx_str_t lock_file;
+ ngx_str_t working_directory;
+ ngx_str_t lock_file;

- ngx_str_t pid;
- ngx_str_t oldpid;
+ ngx_str_t pid;
+ ngx_str_t oldpid;

- ngx_array_t env;
- char **environment;
+ ngx_array_t env;
+ char **environment;
} ngx_core_conf_t;


diff -r 9d7326d3f474 -r 2cd019520210 src/core/ngx_file.c
--- a/src/core/ngx_file.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/core/ngx_file.c Wed Mar 30 11:52:16 2016 +0300
@@ -155,7 +155,7 @@ ngx_create_temp_file(ngx_file_t *file, n

#if 0
for (i = 0; i < file->name.len; i++) {
- file->name.data[i] = 'X';
+ file->name.data[i] = 'X';
}
#endif

diff -r 9d7326d3f474 -r 2cd019520210 src/core/ngx_inet.c
--- a/src/core/ngx_inet.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/core/ngx_inet.c Wed Mar 30 11:52:16 2016 +0300
@@ -1242,19 +1242,19 @@ ngx_cmp_sockaddr(struct sockaddr *sa1, s
#if (NGX_HAVE_UNIX_DOMAIN)
case AF_UNIX:

- /* TODO length */
+ /* TODO length */

- saun1 = (struct sockaddr_un *) sa1;
- saun2 = (struct sockaddr_un *) sa2;
+ saun1 = (struct sockaddr_un *) sa1;
+ saun2 = (struct sockaddr_un *) sa2;

- if (ngx_memcmp(&saun1->sun_path, &saun2->sun_path,
- sizeof(saun1->sun_path))
- != 0)
- {
- return NGX_DECLINED;
- }
+ if (ngx_memcmp(&saun1->sun_path, &saun2->sun_path,
+ sizeof(saun1->sun_path))
+ != 0)
+ {
+ return NGX_DECLINED;
+ }

- break;
+ break;
#endif

default: /* AF_INET */
diff -r 9d7326d3f474 -r 2cd019520210 src/core/ngx_log.c
--- a/src/core/ngx_log.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/core/ngx_log.c Wed Mar 30 11:52:16 2016 +0300
@@ -33,14 +33,14 @@ typedef struct {

static ngx_command_t ngx_errlog_commands[] = {

- {ngx_string("error_log"),
- NGX_MAIN_CONF|NGX_CONF_1MORE,
- ngx_error_log,
- 0,
- 0,
- NULL},
+ { ngx_string("error_log"),
+ NGX_MAIN_CONF|NGX_CONF_1MORE,
+ ngx_error_log,
+ 0,
+ 0,
+ NULL },

- ngx_null_command
+ ngx_null_command
};


@@ -585,7 +585,7 @@ ngx_log_set_log(ngx_conf_t *cf, ngx_log_
return NGX_CONF_ERROR;
}

- } else if (ngx_strncmp(value[1].data, "memory:", 7) == 0) {
+ } else if (ngx_strncmp(value[1].data, "memory:", 7) == 0) {

#if (NGX_DEBUG)
size_t size, needed;
@@ -644,7 +644,7 @@ ngx_log_set_log(ngx_conf_t *cf, ngx_log_
return NGX_CONF_ERROR;
#endif

- } else if (ngx_strncmp(value[1].data, "syslog:", 7) == 0) {
+ } else if (ngx_strncmp(value[1].data, "syslog:", 7) == 0) {
peer = ngx_pcalloc(cf->pool, sizeof(ngx_syslog_peer_t));
if (peer == NULL) {
return NGX_CONF_ERROR;
diff -r 9d7326d3f474 -r 2cd019520210 src/core/ngx_parse_time.c
--- a/src/core/ngx_parse_time.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/core/ngx_parse_time.c Wed Mar 30 11:52:16 2016 +0300
@@ -220,7 +220,7 @@ ngx_parse_http_time(u_char *value, size_
}

if (hour > 23 || min > 59 || sec > 59) {
- return NGX_ERROR;
+ return NGX_ERROR;
}

if (day == 29 && month == 1) {
diff -r 9d7326d3f474 -r 2cd019520210 src/core/ngx_slab.c
--- a/src/core/ngx_slab.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/core/ngx_slab.c Wed Mar 30 11:52:16 2016 +0300
@@ -222,11 +222,11 @@ ngx_slab_alloc_locked(ngx_slab_pool_t *p

if (bitmap[n] == NGX_SLAB_BUSY) {
for (n = n + 1; n < map; n++) {
- if (bitmap[n] != NGX_SLAB_BUSY) {
- p = (uintptr_t) bitmap + i;
+ if (bitmap[n] != NGX_SLAB_BUSY) {
+ p = (uintptr_t) bitmap + i;

- goto done;
- }
+ goto done;
+ }
}

prev = (ngx_slab_page_t *)
diff -r 9d7326d3f474 -r 2cd019520210 src/core/ngx_syslog.c
--- a/src/core/ngx_syslog.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/core/ngx_syslog.c Wed Mar 30 11:52:16 2016 +0300
@@ -10,9 +10,9 @@


#define NGX_SYSLOG_MAX_STR \
- NGX_MAX_ERROR_STR + sizeof("<255>Jan 01 00:00:00 ") - 1 \
- + (NGX_MAXHOSTNAMELEN - 1) + 1 /* space */ \
- + 32 /* tag */ + 2 /* colon, space */
+ NGX_MAX_ERROR_STR + sizeof("<255>Jan 01 00:00:00 ") - 1 \
+ + (NGX_MAXHOSTNAMELEN - 1) + 1 /* space */ \
+ + 32 /* tag */ + 2 /* colon, space */


static char *ngx_syslog_parse_args(ngx_conf_t *cf, ngx_syslog_peer_t *peer);
diff -r 9d7326d3f474 -r 2cd019520210 src/event/modules/ngx_iocp_module.c
--- a/src/event/modules/ngx_iocp_module.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/event/modules/ngx_iocp_module.c Wed Mar 30 11:52:16 2016 +0300
@@ -27,28 +27,28 @@ static ngx_str_t iocp_name = ngx_st

static ngx_command_t ngx_iocp_commands[] = {

- {ngx_string("iocp_threads"),
- NGX_EVENT_CONF|NGX_CONF_TAKE1,
- ngx_conf_set_num_slot,
- 0,
- offsetof(ngx_iocp_conf_t, threads),
- NULL},
+ { ngx_string("iocp_threads"),
+ NGX_EVENT_CONF|NGX_CONF_TAKE1,
+ ngx_conf_set_num_slot,
+ 0,
+ offsetof(ngx_iocp_conf_t, threads),
+ NULL },

- {ngx_string("post_acceptex"),
- NGX_EVENT_CONF|NGX_CONF_TAKE1,
- ngx_conf_set_num_slot,
- 0,
- offsetof(ngx_iocp_conf_t, post_acceptex),
- NULL},
+ { ngx_string("post_acceptex"),
+ NGX_EVENT_CONF|NGX_CONF_TAKE1,
+ ngx_conf_set_num_slot,
+ 0,
+ offsetof(ngx_iocp_conf_t, post_acceptex),
+ NULL },

- {ngx_string("acceptex_read"),
- NGX_EVENT_CONF|NGX_CONF_FLAG,
- ngx_conf_set_flag_slot,
- 0,
- offsetof(ngx_iocp_conf_t, acceptex_read),
- NULL},
+ { ngx_string("acceptex_read"),
+ NGX_EVENT_CONF|NGX_CONF_FLAG,
+ ngx_conf_set_flag_slot,
+ 0,
+ offsetof(ngx_iocp_conf_t, acceptex_read),
+ NULL },

- ngx_null_command
+ ngx_null_command
};


diff -r 9d7326d3f474 -r 2cd019520210 src/event/ngx_event.h
--- a/src/event/ngx_event.h Wed Mar 30 11:52:07 2016 +0300
+++ b/src/event/ngx_event.h Wed Mar 30 11:52:16 2016 +0300
@@ -188,7 +188,7 @@ typedef struct {
ngx_int_t (*notify)(ngx_event_handler_pt handler);

ngx_int_t (*process_events)(ngx_cycle_t *cycle, ngx_msec_t timer,
- ngx_uint_t flags);
+ ngx_uint_t flags);

ngx_int_t (*init)(ngx_cycle_t *cycle, ngx_msec_t timer);
void (*done)(ngx_cycle_t *cycle);
diff -r 9d7326d3f474 -r 2cd019520210 src/event/ngx_event_openssl.c
--- a/src/event/ngx_event_openssl.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/event/ngx_event_openssl.c Wed Mar 30 11:52:16 2016 +0300
@@ -2542,9 +2542,9 @@ done:
void
ngx_ssl_remove_cached_session(SSL_CTX *ssl, ngx_ssl_session_t *sess)
{
- SSL_CTX_remove_session(ssl, sess);
-
- ngx_ssl_remove_session(ssl, sess);
+ SSL_CTX_remove_session(ssl, sess);
+
+ ngx_ssl_remove_session(ssl, sess);
}


diff -r 9d7326d3f474 -r 2cd019520210 src/event/ngx_event_pipe.c
--- a/src/event/ngx_event_pipe.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/event/ngx_event_pipe.c Wed Mar 30 11:52:16 2016 +0300
@@ -434,7 +434,7 @@ ngx_event_pipe_read_upstream(ngx_event_p
/* STUB */ cl->buf->num = p->num++;

if (p->input_filter(p, cl->buf) == NGX_ERROR) {
- return NGX_ABORT;
+ return NGX_ABORT;
}

ngx_free_chain(p->pool, cl);
@@ -801,12 +801,12 @@ ngx_event_pipe_write_chain_to_temp_file(
}

if (cl) {
- p->in = cl;
- *ll = NULL;
+ p->in = cl;
+ *ll = NULL;

} else {
- p->in = NULL;
- p->last_in = &p->in;
+ p->in = NULL;
+ p->last_in = &p->in;
}

} else {
diff -r 9d7326d3f474 -r 2cd019520210 src/http/modules/ngx_http_dav_module.c
--- a/src/http/modules/ngx_http_dav_module.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/http/modules/ngx_http_dav_module.c Wed Mar 30 11:52:16 2016 +0300
@@ -621,11 +621,11 @@ destination_done:
if ((r->uri.data[r->uri.len - 1] == '/' && *(last - 1) != '/')
|| (r->uri.data[r->uri.len - 1] != '/' && *(last - 1) == '/'))
{
- ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
- "both URI \"%V\" and \"Destination\" URI \"%V\" "
- "should be either collections or non-collections",
- &r->uri, &dest->value);
- return NGX_HTTP_CONFLICT;
+ ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
+ "both URI \"%V\" and \"Destination\" URI \"%V\" "
+ "should be either collections or non-collections",
+ &r->uri, &dest->value);
+ return NGX_HTTP_CONFLICT;
}

depth = ngx_http_dav_depth(r, NGX_HTTP_DAV_INFINITY_DEPTH);
diff -r 9d7326d3f474 -r 2cd019520210 src/http/modules/ngx_http_fastcgi_module.c
--- a/src/http/modules/ngx_http_fastcgi_module.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/http/modules/ngx_http_fastcgi_module.c Wed Mar 30 11:52:16 2016 +0300
@@ -751,7 +751,7 @@ ngx_http_fastcgi_eval(ngx_http_request_t
url.no_resolve = 1;

if (ngx_parse_url(r->pool, &url) != NGX_OK) {
- if (url.err) {
+ if (url.err) {
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"%s in upstream \"%V\"", url.err, &url.url);
}
@@ -1800,7 +1800,7 @@ ngx_http_fastcgi_process_header(ngx_http

} else {
r->cache->header_start += u->buffer.pos - start
- - sizeof(ngx_http_fastcgi_header_t);
+ - sizeof(ngx_http_fastcgi_header_t);
}

f->large_stderr = 0;
@@ -2558,8 +2558,8 @@ ngx_http_fastcgi_process_record(ngx_http
case NGX_HTTP_FASTCGI_STDOUT:
case NGX_HTTP_FASTCGI_STDERR:
case NGX_HTTP_FASTCGI_END_REQUEST:
- f->type = (ngx_uint_t) ch;
- break;
+ f->type = (ngx_uint_t) ch;
+ break;
default:
ngx_log_error(NGX_LOG_ERR, r->connection->log, 0,
"upstream sent invalid FastCGI "
@@ -2654,7 +2654,7 @@ ngx_http_fastcgi_finalize_request(ngx_ht
static ngx_int_t
ngx_http_fastcgi_add_variables(ngx_conf_t *cf)
{
- ngx_http_variable_t *var, *v;
+ ngx_http_variable_t *var, *v;

for (v = ngx_http_fastcgi_vars; v->name.len; v++) {
var = ngx_http_add_variable(cf, &v->name, v->flags);
diff -r 9d7326d3f474 -r 2cd019520210 src/http/modules/ngx_http_image_filter_module.c
--- a/src/http/modules/ngx_http_image_filter_module.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/http/modules/ngx_http_image_filter_module.c Wed Mar 30 11:52:16 2016 +0300
@@ -144,7 +144,7 @@ static ngx_command_t ngx_http_image_fil
offsetof(ngx_http_image_filter_conf_t, transparency),
NULL },

- { ngx_string("image_filter_interlace"),
+ { ngx_string("image_filter_interlace"),
NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot,
NGX_HTTP_LOC_CONF_OFFSET,
diff -r 9d7326d3f474 -r 2cd019520210 src/http/modules/ngx_http_mp4_module.c
--- a/src/http/modules/ngx_http_mp4_module.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/http/modules/ngx_http_mp4_module.c Wed Mar 30 11:52:16 2016 +0300
@@ -2555,14 +2555,14 @@ ngx_http_mp4_crop_ctts_data(ngx_http_mp4
"sample:%uD, count:%uD, offset:%uD",
start_sample, count, ngx_mp4_get_32value(entry->offset));

- if (start_sample <= count) {
- rest = start_sample - 1;
- goto found;
- }
-
- start_sample -= count;
- entries--;
- entry++;
+ if (start_sample <= count) {
+ rest = start_sample - 1;
+ goto found;
+ }
+
+ start_sample -= count;
+ entries--;
+ entry++;
}

if (start) {
diff -r 9d7326d3f474 -r 2cd019520210 src/http/modules/ngx_http_range_filter_module.c
--- a/src/http/modules/ngx_http_range_filter_module.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/http/modules/ngx_http_range_filter_module.c Wed Mar 30 11:52:16 2016 +0300
@@ -665,7 +665,7 @@ ngx_http_range_test_overlapped(ngx_http_
range = ctx->ranges.elts;
for (i = 0; i < ctx->ranges.nelts; i++) {
if (start > range[i].start || last < range[i].end) {
- goto overlapped;
+ goto overlapped;
}
}
}
diff -r 9d7326d3f474 -r 2cd019520210 src/http/modules/ngx_http_realip_module.c
--- a/src/http/modules/ngx_http_realip_module.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/http/modules/ngx_http_realip_module.c Wed Mar 30 11:52:16 2016 +0300
@@ -328,8 +328,8 @@ ngx_http_realip_from(ngx_conf_t *cf, ngx
#if (NGX_HAVE_UNIX_DOMAIN)

if (ngx_strcmp(value[1].data, "unix:") == 0) {
- cidr->family = AF_UNIX;
- return NGX_CONF_OK;
+ cidr->family = AF_UNIX;
+ return NGX_CONF_OK;
}

#endif
diff -r 9d7326d3f474 -r 2cd019520210 src/http/modules/ngx_http_referer_module.c
--- a/src/http/modules/ngx_http_referer_module.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/http/modules/ngx_http_referer_module.c Wed Mar 30 11:52:16 2016 +0300
@@ -109,7 +109,7 @@ ngx_module_t ngx_http_referer_module =

static ngx_int_t
ngx_http_referer_variable(ngx_http_request_t *r, ngx_http_variable_value_t *v,
- uintptr_t data)
+ uintptr_t data)
{
u_char *p, *ref, *last;
size_t len;
diff -r 9d7326d3f474 -r 2cd019520210 src/http/modules/ngx_http_rewrite_module.c
--- a/src/http/modules/ngx_http_rewrite_module.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/http/modules/ngx_http_rewrite_module.c Wed Mar 30 11:52:16 2016 +0300
@@ -571,7 +571,7 @@ ngx_http_rewrite_if(ngx_conf_t *cf, ngx_

mconf = module->create_loc_conf(cf);
if (mconf == NULL) {
- return NGX_CONF_ERROR;
+ return NGX_CONF_ERROR;
}

ctx->loc_conf[cf->cycle->modules[i]->ctx_index] = mconf;
diff -r 9d7326d3f474 -r 2cd019520210 src/http/modules/ngx_http_scgi_module.c
--- a/src/http/modules/ngx_http_scgi_module.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/http/modules/ngx_http_scgi_module.c Wed Mar 30 11:52:16 2016 +0300
@@ -876,7 +876,7 @@ ngx_http_scgi_create_request(ngx_http_re
next:

continue;
- }
+ }
}

*b->last++ = (u_char) ',';
diff -r 9d7326d3f474 -r 2cd019520210 src/http/modules/ngx_http_ssl_module.c
--- a/src/http/modules/ngx_http_ssl_module.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/http/modules/ngx_http_ssl_module.c Wed Mar 30 11:52:16 2016 +0300
@@ -337,8 +337,8 @@ ngx_http_ssl_alpn_select(ngx_ssl_conn_t

#if (NGX_DEBUG)
for (i = 0; i < inlen; i += in[i] + 1) {
- ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
- "SSL ALPN supported by client: %*s", in[i], &in[i + 1]);
+ ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
+ "SSL ALPN supported by client: %*s", in[i], &in[i + 1]);
}
#endif

diff -r 9d7326d3f474 -r 2cd019520210 src/http/modules/ngx_http_upstream_least_conn_module.c
--- a/src/http/modules/ngx_http_upstream_least_conn_module.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/http/modules/ngx_http_upstream_least_conn_module.c Wed Mar 30 11:52:16 2016 +0300
@@ -259,7 +259,7 @@ failed:
/ (8 * sizeof(uintptr_t));

for (i = 0; i < n; i++) {
- rrp->tried[i] = 0;
+ rrp->tried[i] = 0;
}

ngx_http_upstream_rr_peers_unlock(peers);
diff -r 9d7326d3f474 -r 2cd019520210 src/http/ngx_http_core_module.c
--- a/src/http/ngx_http_core_module.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/http/ngx_http_core_module.c Wed Mar 30 11:52:16 2016 +0300
@@ -1222,7 +1222,7 @@ ngx_http_core_try_files_phase(ngx_http_r
}

name = path.data + root;
- }
+ }

if (tf->values == NULL) {

@@ -3104,7 +3104,7 @@ ngx_http_core_location(ngx_conf_t *cf, n
ctx->loc_conf[cf->cycle->modules[i]->ctx_index] =
module->create_loc_conf(cf);
if (ctx->loc_conf[cf->cycle->modules[i]->ctx_index] == NULL) {
- return NGX_CONF_ERROR;
+ return NGX_CONF_ERROR;
}
}
}
@@ -4540,21 +4540,21 @@ ngx_http_core_root(ngx_conf_t *cf, ngx_c


static ngx_http_method_name_t ngx_methods_names[] = {
- { (u_char *) "GET", (uint32_t) ~NGX_HTTP_GET },
- { (u_char *) "HEAD", (uint32_t) ~NGX_HTTP_HEAD },
- { (u_char *) "POST", (uint32_t) ~NGX_HTTP_POST },
- { (u_char *) "PUT", (uint32_t) ~NGX_HTTP_PUT },
- { (u_char *) "DELETE", (uint32_t) ~NGX_HTTP_DELETE },
- { (u_char *) "MKCOL", (uint32_t) ~NGX_HTTP_MKCOL },
- { (u_char *) "COPY", (uint32_t) ~NGX_HTTP_COPY },
- { (u_char *) "MOVE", (uint32_t) ~NGX_HTTP_MOVE },
- { (u_char *) "OPTIONS", (uint32_t) ~NGX_HTTP_OPTIONS },
- { (u_char *) "PROPFIND", (uint32_t) ~NGX_HTTP_PROPFIND },
- { (u_char *) "PROPPATCH", (uint32_t) ~NGX_HTTP_PROPPATCH },
- { (u_char *) "LOCK", (uint32_t) ~NGX_HTTP_LOCK },
- { (u_char *) "UNLOCK", (uint32_t) ~NGX_HTTP_UNLOCK },
- { (u_char *) "PATCH", (uint32_t) ~NGX_HTTP_PATCH },
- { NULL, 0 }
+ { (u_char *) "GET", (uint32_t) ~NGX_HTTP_GET },
+ { (u_char *) "HEAD", (uint32_t) ~NGX_HTTP_HEAD },
+ { (u_char *) "POST", (uint32_t) ~NGX_HTTP_POST },
+ { (u_char *) "PUT", (uint32_t) ~NGX_HTTP_PUT },
+ { (u_char *) "DELETE", (uint32_t) ~NGX_HTTP_DELETE },
+ { (u_char *) "MKCOL", (uint32_t) ~NGX_HTTP_MKCOL },
+ { (u_char *) "COPY", (uint32_t) ~NGX_HTTP_COPY },
+ { (u_char *) "MOVE", (uint32_t) ~NGX_HTTP_MOVE },
+ { (u_char *) "OPTIONS", (uint32_t) ~NGX_HTTP_OPTIONS },
+ { (u_char *) "PROPFIND", (uint32_t) ~NGX_HTTP_PROPFIND },
+ { (u_char *) "PROPPATCH", (uint32_t) ~NGX_HTTP_PROPPATCH },
+ { (u_char *) "LOCK", (uint32_t) ~NGX_HTTP_LOCK },
+ { (u_char *) "UNLOCK", (uint32_t) ~NGX_HTTP_UNLOCK },
+ { (u_char *) "PATCH", (uint32_t) ~NGX_HTTP_PATCH },
+ { NULL, 0 }
};


@@ -4627,7 +4627,7 @@ ngx_http_core_limit_except(ngx_conf_t *c

mconf = module->create_loc_conf(cf);
if (mconf == NULL) {
- return NGX_CONF_ERROR;
+ return NGX_CONF_ERROR;
}

ctx->loc_conf[cf->cycle->modules[i]->ctx_index] = mconf;
diff -r 9d7326d3f474 -r 2cd019520210 src/http/ngx_http_core_module.h
--- a/src/http/ngx_http_core_module.h Wed Mar 30 11:52:07 2016 +0300
+++ b/src/http/ngx_http_core_module.h Wed Mar 30 11:52:16 2016 +0300
@@ -232,10 +232,10 @@ typedef struct {


typedef struct {
- ngx_hash_combined_t names;
+ ngx_hash_combined_t names;

- ngx_uint_t nregex;
- ngx_http_server_name_t *regex;
+ ngx_uint_t nregex;
+ ngx_http_server_name_t *regex;
} ngx_http_virtual_names_t;


@@ -544,7 +544,7 @@ typedef ngx_int_t (*ngx_http_request_bod
ngx_int_t ngx_http_output_filter(ngx_http_request_t *r, ngx_chain_t *chain);
ngx_int_t ngx_http_write_filter(ngx_http_request_t *r, ngx_chain_t *chain);
ngx_int_t ngx_http_request_body_save_filter(ngx_http_request_t *r,
- ngx_chain_t *chain);
+ ngx_chain_t *chain);


ngx_int_t ngx_http_set_disable_symlinks(ngx_http_request_t *r,
diff -r 9d7326d3f474 -r 2cd019520210 src/http/ngx_http_script.c
--- a/src/http/ngx_http_script.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/http/ngx_http_script.c Wed Mar 30 11:52:16 2016 +0300
@@ -19,10 +19,10 @@ static ngx_int_t ngx_http_script_add_var
static ngx_int_t ngx_http_script_add_args_code(ngx_http_script_compile_t *sc);
#if (NGX_PCRE)
static ngx_int_t ngx_http_script_add_capture_code(ngx_http_script_compile_t *sc,
- ngx_uint_t n);
+ ngx_uint_t n);
#endif
static ngx_int_t
- ngx_http_script_add_full_name_code(ngx_http_script_compile_t *sc);
+ ngx_http_script_add_full_name_code(ngx_http_script_compile_t *sc);
static size_t ngx_http_script_full_name_len_code(ngx_http_script_engine_t *e);
static void ngx_http_script_full_name_code(ngx_http_script_engine_t *e);

diff -r 9d7326d3f474 -r 2cd019520210 src/http/ngx_http_upstream.c
--- a/src/http/ngx_http_upstream.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/http/ngx_http_upstream.c Wed Mar 30 11:52:16 2016 +0300
@@ -1883,17 +1883,17 @@ ngx_http_upstream_send_request_body(ngx_

if (!r->request_body_no_buffering) {

- /* buffered request body */
-
- if (!u->request_sent) {
- u->request_sent = 1;
- out = u->request_bufs;
-
- } else {
- out = NULL;
- }
-
- return ngx_output_chain(&u->output, out);
+ /* buffered request body */
+
+ if (!u->request_sent) {
+ u->request_sent = 1;
+ out = u->request_bufs;
+
+ } else {
+ out = NULL;
+ }
+
+ return ngx_output_chain(&u->output, out);
}

if (!u->request_sent) {
@@ -4327,10 +4327,10 @@ ngx_http_upstream_process_cache_control(
pa = &u->headers_in.cache_control;

if (pa->elts == NULL) {
- if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *)) != NGX_OK)
- {
- return NGX_ERROR;
- }
+ if (ngx_array_init(pa, r->pool, 2, sizeof(ngx_table_elt_t *)) != NGX_OK)
+ {
+ return NGX_ERROR;
+ }
}

ph = ngx_array_push(pa);
diff -r 9d7326d3f474 -r 2cd019520210 src/http/ngx_http_upstream_round_robin.c
--- a/src/http/ngx_http_upstream_round_robin.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/http/ngx_http_upstream_round_robin.c Wed Mar 30 11:52:16 2016 +0300
@@ -480,7 +480,7 @@ failed:
/ (8 * sizeof(uintptr_t));

for (i = 0; i < n; i++) {
- rrp->tried[i] = 0;
+ rrp->tried[i] = 0;
}

ngx_http_upstream_rr_peers_unlock(peers);
diff -r 9d7326d3f474 -r 2cd019520210 src/http/v2/ngx_http_v2_module.c
--- a/src/http/v2/ngx_http_v2_module.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/http/v2/ngx_http_v2_module.c Wed Mar 30 11:52:16 2016 +0300
@@ -215,7 +215,7 @@ static ngx_http_variable_t ngx_http_v2_
static ngx_int_t
ngx_http_v2_add_variables(ngx_conf_t *cf)
{
- ngx_http_variable_t *var, *v;
+ ngx_http_variable_t *var, *v;

for (v = ngx_http_v2_vars; v->name.len; v++) {
var = ngx_http_add_variable(cf, &v->name, v->flags);
diff -r 9d7326d3f474 -r 2cd019520210 src/mail/ngx_mail.h
--- a/src/mail/ngx_mail.h Wed Mar 30 11:52:07 2016 +0300
+++ b/src/mail/ngx_mail.h Wed Mar 30 11:52:16 2016 +0300
@@ -342,7 +342,7 @@ typedef struct {

void *(*create_srv_conf)(ngx_conf_t *cf);
char *(*merge_srv_conf)(ngx_conf_t *cf, void *prev,
- void *conf);
+ void *conf);
} ngx_mail_module_t;


diff -r 9d7326d3f474 -r 2cd019520210 src/mail/ngx_mail_smtp_handler.c
--- a/src/mail/ngx_mail_smtp_handler.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/mail/ngx_mail_smtp_handler.c Wed Mar 30 11:52:16 2016 +0300
@@ -42,7 +42,7 @@ static u_char smtp_username[] = "334 VX
static u_char smtp_password[] = "334 UGFzc3dvcmQ6" CRLF;
static u_char smtp_invalid_command[] = "500 5.5.1 Invalid command" CRLF;
static u_char smtp_invalid_pipelining[] =
- "503 5.5.0 Improper use of SMTP command pipelining" CRLF;
+ "503 5.5.0 Improper use of SMTP command pipelining" CRLF;
static u_char smtp_invalid_argument[] = "501 5.5.4 Invalid argument" CRLF;
static u_char smtp_auth_required[] = "530 5.7.1 Authentication required" CRLF;
static u_char smtp_bad_sequence[] = "503 5.5.1 Bad sequence of commands" CRLF;
diff -r 9d7326d3f474 -r 2cd019520210 src/mail/ngx_mail_ssl_module.c
--- a/src/mail/ngx_mail_ssl_module.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/mail/ngx_mail_ssl_module.c Wed Mar 30 11:52:16 2016 +0300
@@ -312,13 +312,13 @@ ngx_mail_ssl_merge_conf(ngx_conf_t *cf,
conf->ssl.log = cf->log;

if (conf->enable) {
- mode = "ssl";
+ mode = "ssl";

} else if (conf->starttls != NGX_MAIL_STARTTLS_OFF) {
- mode = "starttls";
+ mode = "starttls";

} else {
- mode = "";
+ mode = "";
}

if (conf->file == NULL) {
diff -r 9d7326d3f474 -r 2cd019520210 src/os/unix/ngx_atomic.h
--- a/src/os/unix/ngx_atomic.h Wed Mar 30 11:52:07 2016 +0300
+++ b/src/os/unix/ngx_atomic.h Wed Mar 30 11:52:16 2016 +0300
@@ -276,26 +276,26 @@ typedef volatile ngx_atomic_uint_t ngx_

static ngx_inline ngx_atomic_uint_t
ngx_atomic_cmp_set(ngx_atomic_t *lock, ngx_atomic_uint_t old,
- ngx_atomic_uint_t set)
+ ngx_atomic_uint_t set)
{
- if (*lock == old) {
- *lock = set;
- return 1;
- }
+ if (*lock == old) {
+ *lock = set;
+ return 1;
+ }

- return 0;
+ return 0;
}


static ngx_inline ngx_atomic_int_t
ngx_atomic_fetch_add(ngx_atomic_t *value, ngx_atomic_int_t add)
{
- ngx_atomic_int_t old;
+ ngx_atomic_int_t old;

- old = *value;
- *value += add;
+ old = *value;
+ *value += add;

- return old;
+ return old;
}

#define ngx_memory_barrier()
diff -r 9d7326d3f474 -r 2cd019520210 src/os/unix/ngx_channel.h
--- a/src/os/unix/ngx_channel.h Wed Mar 30 11:52:07 2016 +0300
+++ b/src/os/unix/ngx_channel.h Wed Mar 30 11:52:16 2016 +0300
@@ -15,10 +15,10 @@


typedef struct {
- ngx_uint_t command;
- ngx_pid_t pid;
- ngx_int_t slot;
- ngx_fd_t fd;
+ ngx_uint_t command;
+ ngx_pid_t pid;
+ ngx_int_t slot;
+ ngx_fd_t fd;
} ngx_channel_t;


diff -r 9d7326d3f474 -r 2cd019520210 src/os/unix/ngx_sunpro_amd64.il
--- a/src/os/unix/ngx_sunpro_amd64.il Wed Mar 30 11:52:07 2016 +0300
+++ b/src/os/unix/ngx_sunpro_amd64.il Wed Mar 30 11:52:16 2016 +0300
@@ -38,6 +38,6 @@
/
/ ld.so.1: nginx: fatal: hardware capability unsupported: 0x2000 [ PAUSE ]

- .inline ngx_cpu_pause,0
- rep; nop
- .end
+ .inline ngx_cpu_pause,0
+ rep; nop
+ .end
diff -r 9d7326d3f474 -r 2cd019520210 src/os/unix/ngx_sunpro_x86.il
--- a/src/os/unix/ngx_sunpro_x86.il Wed Mar 30 11:52:07 2016 +0300
+++ b/src/os/unix/ngx_sunpro_x86.il Wed Mar 30 11:52:16 2016 +0300
@@ -39,6 +39,6 @@
/
/ ld.so.1: nginx: fatal: hardware capability unsupported: 0x2000 [ PAUSE ]

- .inline ngx_cpu_pause,0
- rep; nop
- .end
+ .inline ngx_cpu_pause,0
+ rep; nop
+ .end
diff -r 9d7326d3f474 -r 2cd019520210 src/os/win32/ngx_atomic.h
--- a/src/os/win32/ngx_atomic.h Wed Mar 30 11:52:07 2016 +0300
+++ b/src/os/win32/ngx_atomic.h Wed Mar 30 11:52:16 2016 +0300
@@ -27,16 +27,16 @@ typedef volatile ngx_atomic_uint_t ngx_
/* the new SDK headers */

#define ngx_atomic_cmp_set(lock, old, set) \
- ((ngx_atomic_uint_t) InterlockedCompareExchange((long *) lock, set, old) \
- == old)
+ ((ngx_atomic_uint_t) InterlockedCompareExchange((long *) lock, set, old) \
+ == old)

#else

/* the old MS VC6.0SP2 SDK headers */

#define ngx_atomic_cmp_set(lock, old, set) \
- (InterlockedCompareExchange((void **) lock, (void *) set, (void *) old) \
- == (void *) old)
+ (InterlockedCompareExchange((void **) lock, (void *) set, (void *) old) \
+ == (void *) old)

#endif

diff -r 9d7326d3f474 -r 2cd019520210 src/os/win32/ngx_wsasend_chain.c
--- a/src/os/win32/ngx_wsasend_chain.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/os/win32/ngx_wsasend_chain.c Wed Mar 30 11:52:16 2016 +0300
@@ -233,11 +233,11 @@ ngx_overlapped_wsasend_chain(ngx_connect

} else if (ngx_event_flags & NGX_USE_IOCP_EVENT) {

- /*
- * if a socket was bound with I/O completion port then
- * GetQueuedCompletionStatus() would anyway return its status
- * despite that WSASend() was already complete
- */
+ /*
+ * if a socket was bound with I/O completion port then
+ * GetQueuedCompletionStatus() would anyway return its status
+ * despite that WSASend() was already complete
+ */

wev->active = 1;
return in;
diff -r 9d7326d3f474 -r 2cd019520210 src/stream/ngx_stream_upstream_least_conn_module.c
--- a/src/stream/ngx_stream_upstream_least_conn_module.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/stream/ngx_stream_upstream_least_conn_module.c Wed Mar 30 11:52:16 2016 +0300
@@ -254,7 +254,7 @@ failed:
/ (8 * sizeof(uintptr_t));

for (i = 0; i < n; i++) {
- rrp->tried[i] = 0;
+ rrp->tried[i] = 0;
}

ngx_stream_upstream_rr_peers_unlock(peers);
diff -r 9d7326d3f474 -r 2cd019520210 src/stream/ngx_stream_upstream_round_robin.c
--- a/src/stream/ngx_stream_upstream_round_robin.c Wed Mar 30 11:52:07 2016 +0300
+++ b/src/stream/ngx_stream_upstream_round_robin.c Wed Mar 30 11:52:16 2016 +0300
@@ -356,7 +356,7 @@ failed:
/ (8 * sizeof(uintptr_t));

for (i = 0; i < n; i++) {
- rrp->tried[i] = 0;
+ rrp->tried[i] = 0;
}


_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel