You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2017/03/09 09:39:47 UTC
svn commit: r1786119 - /httpd/httpd/trunk/server/core.c
Author: jorton
Date: Thu Mar 9 09:39:46 2017
New Revision: 1786119
URL: http://svn.apache.org/viewvc?rev=1786119&view=rev
Log:
* server/core.c (start_cond_section): Comment & variable name fixes,
no functional change.
Modified:
httpd/httpd/trunk/server/core.c
Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1786119&r1=1786118&r2=1786119&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Thu Mar 9 09:39:46 2017
@@ -2773,12 +2773,11 @@ typedef int (*test_cond_section_fn)(cmd_
/* Implementation of <IfXXXXX>-style conditional sections. Callback
* to test condition must be in cmd->info, matching function type
- * test_conditional_section. */
+ * test_cond_section_fn. */
static const char *start_cond_section(cmd_parms *cmd, void *mconfig, const char *arg)
{
const char *endp = ap_strrchr_c(arg, '>');
- int not = (arg[0] == '!');
- int found;
+ int result, not = (arg[0] == '!');
test_cond_section_fn testfn = (test_cond_section_fn)cmd->info;
if (endp == NULL) {
@@ -2795,9 +2794,9 @@ static const char *start_cond_section(cm
return missing_container_arg(cmd);
}
- found = testfn(cmd, arg);
+ result = testfn(cmd, arg);
- if ((!not && found) || (not && !found)) {
+ if ((!not && result) || (not && !result)) {
ap_directive_t *parent = NULL;
ap_directive_t *current = NULL;
const char *retval;