www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

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

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1211663 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
2011-12-07 21:59:16 +00:00
parent 408b6818e6
commit 0ecd2fe5e5
6 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/cluster/mod_heartmonitor.c
View File

@@ -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", storage = ap_lookup_provider(AP_SLOTMEM_PROVIDER_GROUP, "shm",
AP_SLOTMEM_PROVIDER_VERSION); AP_SLOTMEM_PROVIDER_VERSION);
if (!storage) { 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', " "failed to lookup provider 'shm' for '%s', "
"maybe you need to load mod_slotmem_shm?", "maybe you need to load mod_slotmem_shm?",
AP_SLOTMEM_PROVIDER_GROUP); 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); storage->create(&slotmem, "mod_heartmonitor", sizeof(hm_slot_server_t), maxworkers, AP_SLOTMEM_TYPE_PREGRAB, p);
if (!slotmem) { 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; return !OK;
} }
} }

2
modules/debugging/mod_dumpio.c
View File

@@ -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 * within ap_log_error, and introduce new vformatter %-escapes
* for escaping text, and for binary text (fixed len strings). * 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, "mod_dumpio: %s (%s-%s): %.*s", f->frec->name,
(APR_BUCKET_IS_METADATA(b)) ? "metadata" : "data", (APR_BUCKET_IS_METADATA(b)) ? "metadata" : "data",
b->type->name, (int)logbytes, buf); b->type->name, (int)logbytes, buf);

4
modules/examples/mod_example_ipc.c
View File

@@ -279,8 +279,8 @@ static int exipc_handler(request_rec *r)
* and returned BUSY. So, bump the time and try again * and returned BUSY. So, bump the time and try again
*/ */
timecamped += CAMPOUT; timecamped += CAMPOUT;
ap_log_error(APLOG_MARK, APLOG_NOERRNO | APLOG_NOTICE, ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, r->server,
0, r->server, "Child %ld camping out on mutex for %" APR_INT64_T_FMT "Child %ld camping out on mutex for %" APR_INT64_T_FMT
" microseconds", " microseconds",
(long int) getpid(), timecamped); (long int) getpid(), timecamped);
} /* Lock acquisition loop */ } /* Lock acquisition loop */

2
modules/metadata/mod_remoteip.c
View File

@@ -397,7 +397,7 @@ static int remoteip_modify_request(request_rec *r)
r->client_addr = req->client_addr; r->client_addr = req->client_addr;
r->client_ip = req->client_ip; 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 req->proxy_ips
? "Using %s as client's IP by proxies %s" ? "Using %s as client's IP by proxies %s"
: "Using %s as client's IP by internal proxies", : "Using %s as client's IP by internal proxies",

12
modules/proxy/balancers/mod_lbmethod_heartbeat.c
View File

@@ -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", storage = ap_lookup_provider(AP_SLOTMEM_PROVIDER_GROUP, "shm",
AP_SLOTMEM_PROVIDER_VERSION); AP_SLOTMEM_PROVIDER_VERSION);
if (!storage) { 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 " "Failed to lookup provider 'shm' for '%s'. Maybe you "
"need to load mod_slotmem_shm?", "need to load mod_slotmem_shm?",
AP_SLOTMEM_PROVIDER_GROUP); 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 */ /* Try to use a slotmem created by mod_heartmonitor */
storage->attach(&hm_serversmem, "mod_heartmonitor", &size, &num, p); storage->attach(&hm_serversmem, "mod_heartmonitor", &size, &num, p);
if (!hm_serversmem) { if (!hm_serversmem)
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, s, "No slotmem from mod_heartmonitor"); ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s,
} else "No slotmem from mod_heartmonitor");
ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, 0, s, "Using slotmem from mod_heartmonitor"); else
ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, s,
"Using slotmem from mod_heartmonitor");
if (hm_serversmem) if (hm_serversmem)
ctx->path = "(slotmem)"; ctx->path = "(slotmem)";

2
modules/ssl/ssl_util.c
View File

@@ -292,7 +292,7 @@ STACK_OF(X509) *ssl_read_pkcs7(server_rec *s, const char *pkcs7)
p7 = PEM_read_PKCS7(f, NULL, NULL, NULL); p7 = PEM_read_PKCS7(f, NULL, NULL, NULL);
if (!p7) { 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); "Can't read PKCS7 object %s", pkcs7);
ssl_log_ssl_error(SSLLOG_MARK, APLOG_CRIT, s); ssl_log_ssl_error(SSLLOG_MARK, APLOG_CRIT, s);
exit(1); exit(1);