diff options
| author | Jeff Trawick <trawick@apache.org> | 2002-05-17 11:33:10 +0000 |
|---|---|---|
| committer | Jeff Trawick <trawick@apache.org> | 2002-05-17 11:33:10 +0000 |
| commit | bc0cf188991f4e0fde00e9a900ab6b7a05e43a3f (patch) | |
| tree | 355356412ebd8742bfc4e1fa0a60b617dae1c043 /os | |
| parent | 50bac91072b1a4f6eb894f11d4272fed985f3912 (diff) | |
| download | httpd-bc0cf188991f4e0fde00e9a900ab6b7a05e43a3f.tar.gz | |
stop using APLOG_NOERRNO in calls to ap_log_[pr]error()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95151 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'os')
| -rw-r--r-- | os/beos/beosd.c | 2 | ||||
| -rw-r--r-- | os/bs2000/bs2login.c | 6 | ||||
| -rw-r--r-- | os/unix/unixd.c | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/os/beos/beosd.c b/os/beos/beosd.c index 90815ad849..0c1aba2922 100644 --- a/os/beos/beosd.c +++ b/os/beos/beosd.c @@ -124,7 +124,7 @@ AP_DECLARE(apr_status_t) beosd_accept(void **accepted, ap_listen_rec *lr, *accepted = csd; apr_os_sock_get(&sockdes, csd); if (sockdes >= FD_SETSIZE) { - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "new file descriptor %d is too large; you probably need " "to rebuild Apache with a larger FD_SETSIZE " "(currently %d)", diff --git a/os/bs2000/bs2login.c b/os/bs2000/bs2login.c index 2a1de0dc01..ab2d3427b0 100644 --- a/os/bs2000/bs2login.c +++ b/os/bs2000/bs2login.c @@ -142,7 +142,7 @@ static bs2_ForkType os_forktype(void) strcmp(os_version.release, "02.0A") == 0 || strcmp(os_version.release, "02.1A") == 0) { - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL, "Error: unsupported OS version. " "You may encounter problems."); forktype = bs2_FORK; @@ -217,7 +217,7 @@ int os_init_job_environment(server_rec *server, const char *user_name, int one_p type = forktype = bs2_noFORK; - ap_log_error(APLOG_MARK, APLOG_ERR|APLOG_NOERRNO, 0, server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, server, "The debug mode of Apache should only " "be started by an unprivileged user!"); return 0; @@ -230,7 +230,7 @@ int os_init_job_environment(server_rec *server, const char *user_name, int one_p /* An Account is required for _rini() */ if (bs2000_account == NULL) { - ap_log_error(APLOG_MARK, APLOG_ALERT|APLOG_NOERRNO, 0, server, + ap_log_error(APLOG_MARK, APLOG_ALERT, 0, server, "No BS2000Account configured - cannot switch to User %s", user_name); exit(APEXIT_CHILDFATAL); diff --git a/os/unix/unixd.c b/os/unix/unixd.c index 21ee63b37b..c854a39716 100644 --- a/os/unix/unixd.c +++ b/os/unix/unixd.c @@ -276,7 +276,7 @@ AP_DECLARE(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit, } } else { - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, cmd->server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, cmd->server, "Invalid parameters for %s", cmd->cmd->name); return; } @@ -289,7 +289,7 @@ AP_DECLARE(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit, if (geteuid()) { limit->rlim_cur = cur; if (max) { - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, cmd->server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, cmd->server, "Must be uid 0 to raise maximum %s", cmd->cmd->name); } } @@ -303,7 +303,7 @@ AP_DECLARE(void) unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit, } #else - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, cmd->server, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, cmd->server, "Platform does not support rlimit for %s", cmd->cmd->name); #endif } @@ -439,7 +439,7 @@ AP_DECLARE(apr_status_t) unixd_accept(void **accepted, ap_listen_rec *lr, *accepted = csd; apr_os_sock_get(&sockdes, csd); if (sockdes >= FD_SETSIZE) { - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_WARNING, 0, NULL, + ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, "new file descriptor %d is too large; you probably need " "to rebuild Apache with a larger FD_SETSIZE " "(currently %d)", @@ -549,7 +549,7 @@ AP_DECLARE(apr_status_t) unixd_accept(void **accepted, ap_listen_rec *lr, return APR_EGENERAL; break; default: - ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, 0, ap_server_conf, + ap_log_error(APLOG_MARK, APLOG_ERR, 0, ap_server_conf, "select/accept error (%d)", status); return APR_EGENERAL; #else |