Commit f883214a authored by Jeff Trawick's avatar Jeff Trawick
Browse files

stop using APLOG_NOERRNO in calls to ap_log_[pr]error() 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95150 13f79535-47bb-0310-9956-ffa450edef68
parent 262aa957

modules/dav/main/mod_dav.h

+4 −4
Changes for modules/dav/main/mod_dav.h: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -97,13 +97,13 @@ extern "C" { 
#define DAV_DEBUG 1

#define DEBUG_CR	"\n"

#define DBG0(f)		ap_log_error(APLOG_MARK, \

				APLOG_ERR|APLOG_NOERRNO, 0, NULL, (f))

				APLOG_ERR, 0, NULL, (f))

#define DBG1(f,a1)	ap_log_error(APLOG_MARK, \

				APLOG_ERR|APLOG_NOERRNO, 0, NULL, f, a1)

				APLOG_ERR, 0, NULL, f, a1)

#define DBG2(f,a1,a2)	ap_log_error(APLOG_MARK, \

				APLOG_ERR|APLOG_NOERRNO, 0, NULL, f, a1, a2)

				APLOG_ERR, 0, NULL, f, a1, a2)

#define DBG3(f,a1,a2,a3) ap_log_error(APLOG_MARK, \

			       APLOG_ERR|APLOG_NOERRNO, 0, NULL, f, a1, a2, a3)

			       APLOG_ERR, 0, NULL, f, a1, a2, a3)

#else

#undef DAV_DEBUG

#define DEBUG_CR	""

modules/mappers/mod_actions.c

+1 −1
Changes for modules/mappers/mod_actions.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static int action_handler(request_rec *r) 
		       action ? action : ap_default_type(r)))) {

	script = t;

	if (r->finfo.filetype == 0) {

	    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,

	    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

			"File does not exist: %s", r->filename);

	    return HTTP_NOT_FOUND;

	}

modules/mappers/mod_alias.c

+2 −2
Changes for modules/mappers/mod_alias.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -443,14 +443,14 @@ static int fixup_redir(request_rec *r) 
                char *orig_target = ret;



                ret = ap_construct_url(r->pool, ret, r);

                ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,

                ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,

                              "incomplete redirection target of '%s' for "

                              "URI '%s' modified to '%s'",

                              orig_target, r->uri, ret);

            }

            if (!ap_is_url(ret)) {

                status = HTTP_INTERNAL_SERVER_ERROR;

                ap_log_rerror(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, r,

                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                              "cannot redirect '%s' to '%s'; "

                              "target is not a valid absoluteURI or abs_path",

                              r->uri, ret);

modules/mappers/mod_imap.c

+3 −3
Changes for modules/mappers/mod_imap.c: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static char *imap_url(request_rec *r, const char *base, const char *value) 
    /* must be a relative URL to be combined with base */

    if (ap_strchr_c(base, '/') == NULL && (!strncmp(value, "../", 3)

        || !strcmp(value, ".."))) {

        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                    "invalid base directive in map file: %s", r->uri);

        return NULL;

    }
@@ -480,7 +480,7 @@ static char *imap_url(request_rec *r, const char *base, const char *value) 
                                   value */

        }

        else if (directory) {

            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                        "invalid directory name in map file: %s", r->uri);

            return NULL;

        }
@@ -887,7 +887,7 @@ static int imap_handler_internal(request_rec *r) 
                                                 we failed. They lose! */



need_2_fields:

    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,

    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

		"map file %s, line %d syntax error: requires at "

                "least two fields", r->uri, imap->line_number);

    /* fall through */

modules/mappers/mod_negotiation.c

+8 −8
Changes for modules/mappers/mod_negotiation.c: 8 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ static void parse_negotiate_header(request_rec *r, negotiation_state *neg) 
    }



#ifdef NEG_DEBUG

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 

            "dont_fiddle_headers=%d use_rvsa=%d ua_supports_trans=%d "

            "send_alternates=%d, may_choose=%d",

            neg->dont_fiddle_headers, neg->use_rvsa,
@@ -877,7 +877,7 @@ static char *lcase_header_name_return_body(char *header, request_rec *r) 
    }



    if (!*cp) {

        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                      "Syntax error in type map, no ':' in %s for header %s", 

                      r->filename, header);

        return NULL;
@@ -888,7 +888,7 @@ static char *lcase_header_name_return_body(char *header, request_rec *r) 
    } while (*cp && apr_isspace(*cp));



    if (!*cp) {

        ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,

        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                      "Syntax error in type map --- no header body: %s for %s",

                      r->filename, header);

        return NULL;
@@ -977,7 +977,7 @@ static int read_type_map(apr_file_t **map, negotiation_state *neg, request_rec * 
                while (--eol >= tag && apr_isspace(*eol)) 

                    *eol = '\0';

                if ((mime_info.body = get_body(buffer, &len, tag, *map)) < 0) {

                    ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,

                    ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                                  "Syntax error in type map, no end tag '%s'"

                                  "found in %s for Body: content.", 

                                  tag, r->filename);
@@ -1232,7 +1232,7 @@ static int read_types_multi(negotiation_state *neg) 
     * request must die.

     */

    if (anymatch && !neg->avail_vars->nelts) {

	ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,

	ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

		      "Negotiation: discovered file(s) matching request: %s"

                      " (None could be negotiated).", 

                      r->filename);
@@ -2004,7 +2004,7 @@ static int is_variant_better_rvsa(negotiation_state *neg, var_rec *variant, 
    */



#ifdef NEG_DEBUG

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 

           "Variant: file=%s type=%s lang=%s sourceq=%1.3f "

           "mimeq=%1.3f langq=%1.3f charq=%1.3f encq=%1.3f "

           "q=%1.5f definite=%d",
@@ -2075,7 +2075,7 @@ static int is_variant_better(negotiation_state *neg, var_rec *variant, 
     */



#ifdef NEG_DEBUG

    ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 

    ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, 

           "Variant: file=%s type=%s lang=%s sourceq=%1.3f "

           "mimeq=%1.3f langq=%1.3f langidx=%d charq=%1.3f encq=%1.3f ",

            (variant->file_name ? variant->file_name : ""),
@@ -2731,7 +2731,7 @@ static int do_negotiation(request_rec *r, negotiation_state *neg, 
        }

        

        if (!*bestp) {

            ap_log_rerror(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, r,

            ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                          "no acceptable variant: %s", r->filename);

            return HTTP_NOT_ACCEPTABLE;

        }