Back out or finish up a few non-apr tests. Won't touch proxy at this

  moment with a 10 foot pole.  fs_dav is ok... the others need apr'ization

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

diff --git a/modules/dav/fs/repos.c b/modules/dav/fs/repos.c
index b34788fcac909e9df269dae6b548d85d870e6872..b00a86c6db37a209665062dcd6334549e5490349 100644 (file)
--- a/modules/dav/fs/repos.c
+++ b/modules/dav/fs/repos.c
@@ -382,6 +382,7 @@ static dav_error * dav_fs_copymove_state(
 {
     apr_finfo_t src_finfo;     /* finfo for source file */
     apr_finfo_t dst_state_finfo;       /* finfo for STATE directory */
+    apr_status_t rv;
     const char *src;
     const char *dst;
 
@@ -399,8 +400,9 @@ static dav_error * dav_fs_copymove_state(
     /* ### do we need to deal with the umask? */
 
     /* ensure that it exists */
-    if (apr_make_dir(dst, APR_OS_DEFAULT, p) != 0) {
-       if (APR_STATUS_IS_EEXIST(errno)) {
+    rv = apr_make_dir(dst, APR_OS_DEFAULT, p);
+    if (rv != APR_SUCCESS) {
+       if (APR_STATUS_IS_EEXIST(rv)) {
            /* ### use something besides 500? */
            return dav_new_error(p, HTTP_INTERNAL_SERVER_ERROR, 0,
                                 "Could not create internal state directory");

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 508fcafef90e8441c0c200552686e75fdfc3866d..0977392bb3c27521b8f89c6de3dd5c28328e1e63 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -214,7 +214,7 @@ static void chdir_for_gprof(void)
            apr_snprintf(buf, sizeof(buf), "%sgprof.%d", dir, (int)getpid());
        } 
        dir = ap_server_root_relative(pconf, buf[0] ? buf : dir);
-       if(mkdir(dir, 0755) < 0 && !APR_ERROR_IS_EEXIST(errno)) {
+       if(mkdir(dir, 0755) < 0 && errno != EEXIST) {
            ap_log_error(APLOG_MARK, APLOG_ERR, errno, ap_server_conf,
                         "gprof: error creating directory %s", dir);
        }