Discussion:
svn commit: r1631118 - in /httpd/httpd/branches/2.4.x: CHANGES STATUS modules/core/mod_macro.c
j***@apache.org
2014-10-11 21:12:18 UTC
Permalink
Author: jailletc36
Date: Sat Oct 11 21:12:18 2014
New Revision: 1631118

URL: http://svn.apache.org/r1631118
Log:
Merge r1612466 from trunk:

mod_macro: Remove APLOG_NOERRNO. Add some APLOGNO. Fix some alignment.

Submitted by: jailletc36
Reviewed by: jailletc36, rjung, covener
backported by: jailletc36

Modified:
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/core/mod_macro.c

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1631118&r1=1631117&r2=1631118&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sat Oct 11 21:12:18 2014
@@ -6,6 +6,9 @@ Changes with Apache 2.4.11
mod_cache: Avoid a crash when Content-Type has an empty value.
PR 56924. [Mark Montague <mark catseye.org>, Jan Kaluza]

+ *) mod_macro: Add missing APLOGNO for some Warning log messages.
+ [Christophe Jaillet]
+
*) mod_cache: Avoid sending 304 responses during failed revalidations
PR56881. [Eric Covener]


Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1631118&r1=1631117&r2=1631118&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Oct 11 21:12:18 2014
@@ -147,11 +147,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
2.4.x patch: http://people.apache.org/~jim/patches/worker-trunc.patch
+1: jim, ylavic, covener

- * mod_macro: Remove APLOG_NOERRNO. Add some APLOGNO. Fix some alignment.
- trunk patch: http://svn.apache.org/r1612466
- 2.4.x patch: trunk works
- +1: jailletc36, rjung, covener
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]


Modified: httpd/httpd/branches/2.4.x/modules/core/mod_macro.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/core/mod_macro.c?rev=1631118&r1=1631117&r2=1631118&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/core/mod_macro.c (original)
+++ httpd/httpd/branches/2.4.x/modules/core/mod_macro.c Sat Oct 11 21:12:18 2014
@@ -115,17 +115,16 @@ static apr_array_header_t *get_arguments
/*
warn if anything non blank appears, but ignore comments...
*/
-static void warn_if_non_blank(
- const char * what,
- char * ptr,
- ap_configfile_t * cfg)
+static void warn_if_non_blank(const char * what,
+ char * ptr,
+ ap_configfile_t * cfg)
{
char * p;
for (p=ptr; *p; p++) {
if (*p == '#')
break;
if (*p != ' ' && *p != '\t') {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,
"%s on line %d of %s: %s",
what, cfg->line_number, cfg->name, ptr);
break;
@@ -164,8 +163,8 @@ static char *get_lines_till_end_token(ap
if (!strncmp(first, "</", 2)) {
any_nesting--;
if (any_nesting < 0) {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING,
- 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_WARNING,
+ 0, NULL, APLOGNO(02793)
"bad (negative) nesting on line %d of %s",
config_file->line_number - line_number_start,
where);
@@ -185,14 +184,14 @@ static char *get_lines_till_end_token(ap
}

warn_if_non_blank(
- "non blank chars found after directive closing",
+ APLOGNO(02794) "non blank chars found after directive closing",
endp+1, config_file);

macro_nesting--;
if (!macro_nesting) {
if (any_nesting) {
ap_log_error(APLOG_MARK,
- APLOG_NOERRNO | APLOG_WARNING, 0, NULL,
+ APLOG_WARNING, 0, NULL, APLOGNO(02795)
"bad cumulated nesting (%+d) in %s",
any_nesting, where);
}
@@ -257,7 +256,7 @@ static const char *check_macro_arguments
macro->name, macro->location, i + 1);
}
else if (!looks_like_an_argument(tab[i])) {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, APLOGNO(02796)
"macro '%s' (%s) "
"argument name '%s' (#%d) without expected prefix, "
"better prefix argument names with one of '%s'.",
@@ -271,7 +270,7 @@ static const char *check_macro_arguments
/* must not use the same argument name twice */
if (!strcmp(tab[i], tab[j])) {
return apr_psprintf(pool,
- "argument name conflict in macro '%s' (%s): "
+ "argument name conflict in macro '%s' (%s): "
"argument '%s': #%d and #%d, "
"change argument names!",
macro->name, macro->location,
@@ -281,11 +280,11 @@ static const char *check_macro_arguments
/* warn about common prefix, but only if non empty names */
if (ltabi && ltabj &&
!strncmp(tab[i], tab[j], ltabi < ltabj ? ltabi : ltabj)) {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING,
- 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_WARNING,
+ 0, NULL, APLOGNO(02797)
"macro '%s' (%s): "
- "argument name prefix conflict (%s #%d and %s #%d),"
- " be careful about your macro definition!",
+ "argument name prefix conflict (%s #%d and %s #%d), "
+ "be careful about your macro definition!",
macro->name, macro->location,
tab[i], i + 1, tab[j], j + 1);
}
@@ -305,7 +304,7 @@ static void check_macro_use_arguments(co
int i;
for (i = 0; i < array->nelts; i++) {
if (empty_string_p(tab[i])) {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, APLOGNO(02798)
"%s: empty argument #%d", where, i + 1);
}
}
@@ -506,7 +505,7 @@ static const char *check_macro_contents(
const char *errmsg;

if (macro->contents->nelts == 0) {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, APLOGNO(02799)
"macro '%s' (%s): empty contents!",
macro->name, macro->location);
return NULL; /* no need to further warnings... */
@@ -526,7 +525,7 @@ static const char *check_macro_contents(

for (i = 0; i < nelts; i++) {
if (!used->elts[i]) {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, APLOGNO(02800)
"macro '%s' (%s): argument '%s' (#%d) never used",
macro->name, macro->location, names[i], i + 1);
}
@@ -719,7 +718,8 @@ static const char *macro_section(cmd_par
return BEGIN_MACRO " macro definition: empty name";
}

- warn_if_non_blank("non blank chars found after " BEGIN_MACRO " closing '>'",
+ warn_if_non_blank(APLOGNO(02801) "non blank chars found after "
+ BEGIN_MACRO " closing '>'",
endp+1, cmd->config_file);

/* coldly drop '>[^>]*$' out */
@@ -736,7 +736,7 @@ static const char *macro_section(cmd_par

if (macro != NULL) {
/* already defined: warn about the redefinition */
- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, APLOGNO(02802)
"macro '%s' multiply defined: "
"%s, redefined on line %d of \"%s\"",
macro->name, macro->location,
@@ -761,7 +761,7 @@ static const char *macro_section(cmd_par
apr_psprintf(pool, "macro '%s' (%s)", macro->name, macro->location);

if (looks_like_an_argument(name)) {
- ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_WARNING, 0, NULL,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, APLOGNO(02803)
"%s better prefix a macro name with any of '%s'",
where, ARG_PREFIX);
}

Loading...