Commit ee7a8efc authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  More APR_STATUS_IS_ canonicalization


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

modules/aaa/mod_access.c

+5 −6
Original line number Diff line number Diff line
@@ -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);

server/mpm/prefork/prefork.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	    }