get rid of some bogus uses of perror()

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

diff --git a/server/config.c b/server/config.c
index ea0f432df1e5547c8630c02dbfb4d56dbb742f7b..8b1f579a40b101da08d20b3bf1986f18d796d987 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -1297,6 +1297,8 @@ void ap_process_resource_config(server_rec *s, const char *fname,
        int current;
        apr_array_header_t *candidates = NULL;
        fnames *fnew;
+        apr_status_t rv;
+        char errmsg[120];
 
        /*
         * first course of business is to grok all the directory
@@ -1304,10 +1306,11 @@ void ap_process_resource_config(server_rec *s, const char *fname,
         * for this.
         */
        fprintf(stderr, "Processing config directory: %s\n", fname);
-       if (apr_dir_open(&dirp, fname, p) != APR_SUCCESS) {
-           perror("fopen");
-           fprintf(stderr, "%s: could not open config directory %s\n",
-               ap_server_argv0, fname);
+        rv = apr_dir_open(&dirp, fname, p);
+        if (rv != APR_SUCCESS) {
+           fprintf(stderr, "%s: could not open config directory %s: %s\n",
+                    ap_server_argv0, fname,
+                    apr_strerror(rv, errmsg, sizeof errmsg));
            exit(1);
        }
        candidates = apr_make_array(p, 1, sizeof(fnames));

diff --git a/server/log.c b/server/log.c
index cba077d3538b9dba7c727530f0687386000c977c..fd6a20ae23ad4dc9d2de66a858f14fd6ec254b04 100644 (file)
--- a/server/log.c
+++ b/server/log.c
@@ -188,7 +188,7 @@ static int log_child(apr_pool_t *p, const char *progname,
      * may want a common framework for this, since I expect it will
      * be common for other foo-loggers to want this sort of thing...
      */
-    int rc = -1;
+    apr_status_t rc;
     apr_procattr_t *procattr;
     apr_proc_t *procnew;
 
@@ -197,15 +197,11 @@ static int log_child(apr_pool_t *p, const char *progname,
     apr_signal(SIGHUP, SIG_IGN);
 #endif /* ndef SIGHUP */
 
-    if ((apr_createprocattr_init(&procattr, p) != APR_SUCCESS) ||
-        (apr_setprocattr_io(procattr,
-                           APR_FULL_BLOCK,
-                           APR_NO_PIPE,
-                           APR_NO_PIPE) != APR_SUCCESS)) {
-        /* Something bad happened, give up and go away. */
-        rc = -1;
-    }
-    else {
+    if (((rc = apr_createprocattr_init(&procattr, p)) == APR_SUCCESS) &&
+        ((rc = apr_setprocattr_io(procattr,
+                                  APR_FULL_BLOCK,
+                                  APR_NO_PIPE,
+                                  APR_NO_PIPE)) == APR_SUCCESS)) {
         char **args;
         const char *pname;
         
@@ -235,10 +231,9 @@ static void open_error_log(server_rec *s, apr_pool_t *p)
         /* This starts a new process... */
         rc = log_child (p, s->error_fname+1, &dummy);
         if (rc != APR_SUCCESS) {
-           perror("ap_spawn_child");
-           ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
-                         "Couldn't fork child for ErrorLog process");
-                        exit(1);
+           ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, NULL, 
+                         "Couldn't start ErrorLog process");
+            exit(1);
        }
 
         s->error_log = dummy;
@@ -735,9 +730,8 @@ AP_DECLARE(piped_log *) ap_open_piped_log(apr_pool_t *p, const char *program)
 
     rc = log_child(p, program, &dummy);
     if (rc != APR_SUCCESS) {
-       perror("ap_spawn_child");
-       ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, 
-                     "Couldn't fork child for piped log process");
+       ap_log_error(APLOG_MARK, APLOG_STARTUP, rc, NULL, 
+                     "Couldn't start piped log process");
        exit (1);
     }