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

diff --git a/modules/cluster/mod_heartmonitor.c b/modules/cluster/mod_heartmonitor.c
index 46e687b089e66a4ec2aaeeb54a71c98bd3abcb8a..ec12a2a4115890d844ee8251ddcc7c645da91cb5 100644 (file)
--- a/modules/cluster/mod_heartmonitor.c
+++ b/modules/cluster/mod_heartmonitor.c
@@ -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;
             }
         }

diff --git a/modules/debugging/mod_dumpio.c b/modules/debugging/mod_dumpio.c
index e15932db55e76c9144bec5b5fd5da4f58381200d..a56fa162c56f89950896996d8fd20cae310473c7 100644 (file)
--- a/modules/debugging/mod_dumpio.c
+++ b/modules/debugging/mod_dumpio.c
@@ -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);

diff --git a/modules/examples/mod_example_ipc.c b/modules/examples/mod_example_ipc.c
index 76887649baf9d02ba37bc0b82223a12a0c8ff626..27c87443deda666fdd4097d92475b589d4d4e8c5 100644 (file)
--- a/modules/examples/mod_example_ipc.c
+++ b/modules/examples/mod_example_ipc.c
@@ -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 */

diff --git a/modules/metadata/mod_remoteip.c b/modules/metadata/mod_remoteip.c
index 363d812ad5fb398a860a2092f626655bda8f64ad..aa9ae4e230b36f3a924a9972240de4062a51b42f 100644 (file)
--- a/modules/metadata/mod_remoteip.c
+++ b/modules/metadata/mod_remoteip.c
@@ -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",

diff --git a/modules/proxy/balancers/mod_lbmethod_heartbeat.c b/modules/proxy/balancers/mod_lbmethod_heartbeat.c
index e0ff3ed5cdb7f0efa36c6b9fca596a77a5aede90..7b4d1b330d16f798cd0779c779be18fbcbd3d79c 100644 (file)
--- a/modules/proxy/balancers/mod_lbmethod_heartbeat.c
+++ b/modules/proxy/balancers/mod_lbmethod_heartbeat.c
@@ -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)";

diff --git a/modules/ssl/ssl_util.c b/modules/ssl/ssl_util.c
index 9750253750b3d506b6c7f700dd342ef3b450b6dd..969dab28738d0b9b3e172afede6de548eb69c815 100644 (file)
--- a/modules/ssl/ssl_util.c
+++ b/modules/ssl/ssl_util.c
@@ -292,7 +292,7 @@ STACK_OF(X509) *ssl_read_pkcs7(server_rec *s, const char *pkcs7)
 
     p7 = PEM_read_PKCS7(f, NULL, NULL, NULL);
     if (!p7) {
-        ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, s,
+        ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
                      "Can't read PKCS7 object %s", pkcs7);
         ssl_log_ssl_error(SSLLOG_MARK, APLOG_CRIT, s);
         exit(1);