More APR_STATUS_IS_ canonicalization

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

diff --git a/modules/aaa/mod_access.c b/modules/aaa/mod_access.c
index ac9f275cbe3971e663f065d6da2f424b3b2ac150..d51df93a400fb42d4c3bbcc84cd33ed1ca3e10cf 100644 (file)
--- a/modules/aaa/mod_access.c
+++ b/modules/aaa/mod_access.c
@@ -175,18 +175,17 @@ static const char *allow_cmd(cmd_parms *cmd, void *dv, const char *from,
     else if ((s = strchr(where, '/'))) {
         *s++ = '\0';
         rv = apr_ipsubnet_create(&a->x.ip, where, s, cmd->pool);
-        switch(rv) {
-        case APR_SUCCESS:
-            break;
-        case APR_EINVAL: /* looked nothing like an IP address */
+        if(APR_STATUS_IS_EINVAL(rv)) {
+            /* looked nothing like an IP address */
             return "An IP address was expected";
-        default:
+        }
+        else if (rv != APR_SUCCESS) {
             apr_strerror(rv, msgbuf, sizeof msgbuf);
             return apr_pstrdup(cmd->pool, msgbuf);
         }
         a->type = T_IP;
     }
-    else if ((rv = apr_ipsubnet_create(&a->x.ip, where, NULL, cmd->pool)) != APR_EINVAL) {
+    else if (!APR_STATUS_IS_EINVAL(rv = apr_ipsubnet_create(&a->x.ip, where, NULL, cmd->pool))) {
         if (rv != APR_SUCCESS) {
             apr_strerror(rv, msgbuf, sizeof msgbuf);
             return apr_pstrdup(cmd->pool, msgbuf);

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 2546570d3b6578036f3c0f3473ef30ea71a10672..b6f6696ad987f860ca8d13395a3e272a3904ca15 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -660,7 +660,7 @@ static void child_main(int child_num_arg)
                    clean_child_exit(0);
                }
                stat = apr_accept(&csd, sd, ptrans);
-               if (stat == APR_SUCCESS || stat != APR_EINTR)
+               if (stat == APR_SUCCESS || !APR_STATUS_IS_EINTR(stat))
                    break;
            }