httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fab...@apache.org
Subject svn commit: r1418734 - /httpd/httpd/trunk/server/core.c
Date Sat, 08 Dec 2012 19:06:50 GMT
Author: fabien
Date: Sat Dec  8 19:06:50 2012
New Revision: 1418734

URL: http://svn.apache.org/viewvc?rev=1418734&view=rev
Log:
remove C99 features from 'Warning' directive handling

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=1418734&r1=1418733&r2=1418734&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Sat Dec  8 19:06:50 2012
@@ -1349,6 +1349,12 @@ static const char *generate_message(cmd_
 {
     /* cast with 64-bit warning avoidance */
     int level = (cmd->info==(void*)APLOG_ERR)? APLOG_ERR: APLOG_WARNING;
+    char * msg;
+
+    /* get position information from wherever we can? */
+    ap_configfile_t * cf = cmd->config_file;
+    ap_directive_t const * ed1 = cmd->directive;
+    ap_directive_t const * ed2 = cmd->err_directive;
 
     /* expect an argument */
     if (!arg || !*arg) {
@@ -1356,7 +1362,7 @@ static const char *generate_message(cmd_
     }
 
     /* set message, strip off quotes if necessary */
-    char * msg = (char *)arg;
+    msg = (char *)arg;
     if (*arg == '"' || *arg == '\'') {
         apr_size_t len = strlen(arg);
         char last = *(arg + len - 1);
@@ -1366,11 +1372,6 @@ static const char *generate_message(cmd_
         }
     }
 
-    /* get position information from wherever we can? */
-    ap_configfile_t * cf = cmd->config_file;
-    ap_directive_t const * ed1 = cmd->directive;
-    ap_directive_t const * ed2 = cmd->err_directive;
-
     /* generate error or warning with a configuration file position.
      * the log is displayed on the terminal as no log file is opened yet.
      */



Mime
View raw message