You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2005/09/29 08:44:20 UTC

svn commit: r292397 - /httpd/httpd/branches/2.0.x/server/core.c

Author: wrowe
Date: Wed Sep 28 23:44:16 2005
New Revision: 292397

URL: http://svn.apache.org/viewcvs?rev=292397&view=rev
Log:

  Small fix to remove unused 'rv' variable from the excluded code path

Modified:
    httpd/httpd/branches/2.0.x/server/core.c

Modified: httpd/httpd/branches/2.0.x/server/core.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/server/core.c?rev=292397&r1=292396&r2=292397&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/server/core.c (original)
+++ httpd/httpd/branches/2.0.x/server/core.c Wed Sep 28 23:44:16 2005
@@ -4485,9 +4485,10 @@
 static int core_pre_connection(conn_rec *c, void *csd)
 {
     core_net_rec *net = apr_palloc(c->pool, sizeof(*net));
-    apr_status_t rv;
 
 #ifdef AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
+    apr_status_t rv;
+
     /* BillS says perhaps this should be moved to the MPMs. Some OSes
      * allow listening socket attributes to be inherited by the
      * accept sockets which means this call only needs to be made
@@ -4576,7 +4577,8 @@
     STANDARD20_MODULE_STUFF,
     create_core_dir_config,       /* create per-directory config structure */
     merge_core_dir_configs,       /* merge per-directory config structures */
-    create_core_server_config,    /* create per-server config structure */
+    create_core_se
+    er_config,    /* create per-server config structure */
     merge_core_server_configs,    /* merge per-server config structures */
     core_cmds,                    /* command apr_table_t */
     register_hooks                /* register hooks */



Re: svn commit: r292397 - /httpd/httpd/branches/2.0.x/server/core.c

Posted by Jeff Trawick <tr...@gmail.com>.
On 9/29/05, William A. Rowe, Jr. <wr...@rowe-clan.net> wrote:
> Although it took two commits, please comment on the following patch to
> eliminate an 'unused variable' rv in some cases (happy to back out if
> there are objections);

keep it

Re: svn commit: r292397 - /httpd/httpd/branches/2.0.x/server/core.c

Posted by "William A. Rowe, Jr." <wr...@rowe-clan.net>.
Although it took two commits, please comment on the following patch to
eliminate an 'unused variable' rv in some cases (happy to back out if
there are objections);

Index: server/core.c^M
===================================================================
--- server/core.c       (revision 292396)
+++ server/core.c       (working copy)
@@ -4485,9 +4485,10 @@
  static int core_pre_connection(conn_rec *c, void *csd)
  {
      core_net_rec *net = apr_palloc(c->pool, sizeof(*net));
+
+#ifdef AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
      apr_status_t rv;

-#ifdef AP_MPM_DISABLE_NAGLE_ACCEPTED_SOCK
      /* BillS says perhaps this should be moved to the MPMs. Some OSes
       * allow listening socket attributes to be inherited by the
       * accept sockets which means this call only needs to be made

Thanks,

Bill