Author: stefan2
Date: Wed Nov 27 05:59:39 2013
New Revision: 1545931
URL: http://svn.apache.org/r1545931
Log:
Fix a compiler warning.
* subversion/svnserve/serve.c
(serve_interruptable): Rename local variable to prevent it shadowing
the status() function.
Modified:
subversion/trunk/subversion/svnserve/serve.c
Modified: subversion/trunk/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=1545931&r1=1545930&r2=1545931&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/serve.c (original)
+++ subversion/trunk/subversion/svnserve/serve.c Wed Nov 27 05:59:39 2013
@@ -3864,7 +3864,7 @@ serve_interruptable(svn_boolean_t *termi
}
else
{
- apr_status_t status;
+ apr_status_t ar;
/* Enable TCP keep-alives on the socket so we time out when
* the connection breaks due to network-layer problems.
@@ -3874,8 +3874,8 @@ serve_interruptable(svn_boolean_t *termi
* it will respond to the keep-alive probe with a RST instead of an
* acknowledgment segment, which will cause svn to abort the session
* even while it is currently blocked waiting for data from the peer. */
- status = apr_socket_opt_set(connection->usock, APR_SO_KEEPALIVE, 1);
- if (status)
+ ar = apr_socket_opt_set(connection->usock, APR_SO_KEEPALIVE, 1);
+ if (ar)
{
/* It's not a fatal error if we cannot enable keep-alives. */
}
@@ -3893,7 +3893,7 @@ serve_interruptable(svn_boolean_t *termi
connection->params, pool));
}
- /* Process incomming commands. */
+ /* Process incoming commands. */
while (!terminate)
{
svn_pool_clear(iterpool);
|