Commit 07f475e4 authored by Stefan Fritsch's avatar Stefan Fritsch
Browse files

Remove usage of APLOG_NOERRNO. It has been a no-op since at least 2.0.x 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1211663 13f79535-47bb-0310-9956-ffa450edef68
parent 678f5ed7

modules/cluster/mod_heartmonitor.c

+2 −2
Changes for modules/cluster/mod_heartmonitor.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ static int hm_post_config(apr_pool_t *p, apr_pool_t *plog, 
            storage = ap_lookup_provider(AP_SLOTMEM_PROVIDER_GROUP, "shm",

                                         AP_SLOTMEM_PROVIDER_VERSION);

            if (!storage) {

                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, s,

                ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s,

                             "failed to lookup provider 'shm' for '%s', "

                             "maybe you need to load mod_slotmem_shm?",

                             AP_SLOTMEM_PROVIDER_GROUP);
@@ -692,7 +692,7 @@ static int hm_post_config(apr_pool_t *p, apr_pool_t *plog, 
            }

            storage->create(&slotmem, "mod_heartmonitor", sizeof(hm_slot_server_t), maxworkers, AP_SLOTMEM_TYPE_PREGRAB, p);

            if (!slotmem) {

                ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, 0, s, "slotmem_create for status failed");

                ap_log_error(APLOG_MARK, APLOG_EMERG, 0, s, "slotmem_create for status failed");

                return !OK;

            }

        }

modules/debugging/mod_dumpio.c

+1 −1
Changes for modules/debugging/mod_dumpio.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static void dumpit(ap_filter_t *f, apr_bucket *b, dumpio_conf_t *ptr) 
                 * within ap_log_error, and introduce new vformatter %-escapes

                 * for escaping text, and for binary text (fixed len strings).

                 */

                ap_log_cerror(APLOG_MARK | APLOG_NOERRNO, APLOG_TRACE7, 0, c,

                ap_log_cerror(APLOG_MARK, APLOG_TRACE7, 0, c,

                              "mod_dumpio:  %s (%s-%s): %.*s", f->frec->name,

                              (APR_BUCKET_IS_METADATA(b)) ? "metadata" : "data",

                              b->type->name, (int)logbytes, buf);

modules/examples/mod_example_ipc.c

+2 −2
Changes for modules/examples/mod_example_ipc.c: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -279,8 +279,8 @@ static int exipc_handler(request_rec *r) 
         * and returned BUSY. So, bump the time and try again

         */

        timecamped += CAMPOUT;

        ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_NOTICE,

                     0, r->server, "Child %ld camping out on mutex for %" APR_INT64_T_FMT

        ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, r->server,

                     "Child %ld camping out on mutex for %" APR_INT64_T_FMT

                     " microseconds",

                     (long int) getpid(), timecamped);

    } /* Lock acquisition loop */

modules/metadata/mod_remoteip.c

+1 −1
Changes for modules/metadata/mod_remoteip.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ static int remoteip_modify_request(request_rec *r) 
    r->client_addr = req->client_addr;

    r->client_ip = req->client_ip;



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

    ap_log_rerror(APLOG_MARK, APLOG_INFO, 0, r,

                  req->proxy_ips

                      ? "Using %s as client's IP by proxies %s"

                      : "Using %s as client's IP by internal proxies",

modules/proxy/balancers/mod_lbmethod_heartbeat.c

+7 −5
Changes for modules/proxy/balancers/mod_lbmethod_heartbeat.c: 7 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ static int lb_hb_init(apr_pool_t *p, apr_pool_t *plog, 
    storage = ap_lookup_provider(AP_SLOTMEM_PROVIDER_GROUP, "shm",

                                 AP_SLOTMEM_PROVIDER_VERSION);

    if (!storage) {

        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, s,

        ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s,

                     "Failed to lookup provider 'shm' for '%s'. Maybe you "

                     "need to load mod_slotmem_shm?",

                     AP_SLOTMEM_PROVIDER_GROUP);
@@ -383,10 +383,12 @@ static int lb_hb_init(apr_pool_t *p, apr_pool_t *plog, 


    /* Try to use a slotmem created by mod_heartmonitor */

    storage->attach(&hm_serversmem, "mod_heartmonitor", &size, &num, p);

    if (!hm_serversmem) {

        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, s, "No slotmem from mod_heartmonitor");

    } else

        ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, s, "Using slotmem from mod_heartmonitor");

    if (!hm_serversmem)

        ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s,

                     "No slotmem from mod_heartmonitor");

    else

        ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s,

                     "Using slotmem from mod_heartmonitor");



    if (hm_serversmem)

        ctx->path = "(slotmem)";