Re: [PATCH] use ap_ prefixed PCRE functions - take 3

[Guenter Knauf]

Hi Kurt,
> Just a tweak or two and its ready. The preg calloc only applies to the
> HAS_PCRE case and PREGCOMP isn't needed. Otherwise it looks good. I'll
> test and commit it tomorrow.
yep, forgot to remove PREGCOMP.

you mean perhaps so:

        {
#ifdef HAS_AP_PCRE
            regex_t *preg = ap_pregcomp((apr_pool_t *)uriEnv->pool->_private, 
uriEnv->uri, REG_EXTENDED);
            if (preg == NULL) {
#else
            regex_t *preg = (regex_t *)uriEnv->pool->calloc( env, uriEnv->pool, 
sizeof(regex_t));
            if (regcomp(preg, uriEnv->uri, REG_EXTENDED)) {
#endif
                env->l->jkLog(env, env->l, JK_LOG_DEBUG,
                              "uriEnv.parseName() error compiling regexp %s\n",
                              uri);
                return JK_ERR;
            }
            uriEnv->regexp = preg;
        }
        return JK_OK;
#else
        env->l->jkLog(env, env->l, JK_LOG_INFO,
                    "uriEnv.parseName() parsing regexp %s not supported\n",
                    uri);
        return JK_ERR;
#endif
    }

Guenter.


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]