details: http://hg.nginx.org/nginx/rev/31690d934175
branches:
changeset: 5282:31690d934175
user: Ruslan Ermilov <ru@nginx.com>
date: Thu Jul 25 12:46:02 2013 +0400
description:
Style: reuse one int variable in ngx_configure_listening_sockets().

No functional changes.

diffstat:

src/core/ngx_connection.c | 19 ++++++++-----------
1 files changed, 8 insertions(+), 11 deletions(-)

diffs (65 lines):

diff -r 7542b72fe4b1 -r 31690d934175 src/core/ngx_connection.c
--- a/src/core/ngx_connection.c Wed Jul 24 22:24:25 2013 +0400
+++ b/src/core/ngx_connection.c Thu Jul 25 12:46:02 2013 +0400
@@ -464,16 +464,13 @@ ngx_open_listening_sockets(ngx_cycle_t *
void
ngx_configure_listening_sockets(ngx_cycle_t *cycle)
{
- int keepalive;
+ int value;
ngx_uint_t i;
ngx_listening_t *ls;

#if (NGX_HAVE_DEFERRED_ACCEPT && defined SO_ACCEPTFILTER)
struct accept_filter_arg af;
#endif
-#if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
- int timeout;
-#endif

ls = cycle->listening.elts;
for (i = 0; i < cycle->listening.nelts; i++) {
@@ -503,15 +500,15 @@ ngx_configure_listening_sockets(ngx_cycl
}

if (ls[i].keepalive) {
- keepalive = (ls[i].keepalive == 1) ? 1 : 0;
+ value = (ls[i].keepalive == 1) ? 1 : 0;

if (setsockopt(ls[i].fd, SOL_SOCKET, SO_KEEPALIVE,
- (const void *) &keepalive, sizeof(int))
+ (const void *) &value, sizeof(int))
== -1)
{
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_socket_errno,
"setsockopt(SO_KEEPALIVE, %d) %V failed, ignored",
- keepalive, &ls[i].addr_text);
+ value, &ls[i].addr_text);
}
}

@@ -648,20 +645,20 @@ ngx_configure_listening_sockets(ngx_cycl
if (ls[i].add_deferred || ls[i].delete_deferred) {

if (ls[i].add_deferred) {
- timeout = (int) (ls[i].post_accept_timeout / 1000);
+ value = (int) (ls[i].post_accept_timeout / 1000);

} else {
- timeout = 0;
+ value = 0;
}

if (setsockopt(ls[i].fd, IPPROTO_TCP, TCP_DEFER_ACCEPT,
- &timeout, sizeof(int))
+ &value, sizeof(int))
== -1)
{
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
"setsockopt(TCP_DEFER_ACCEPT, %d) for %V failed, "
"ignored",
- timeout, &ls[i].addr_text);
+ value, &ls[i].addr_text);

continue;
}

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