--- l2_ch_filter.c 2001/11/07 11:37:18 1.13
+++ l2_ch_filter.c 2001/11/07 13:05:20 1.14
@@ -70,17 +70,17 @@
int nErrorOffset;
/* feed and call generic parameter parsing engine */
- L2_PARAM_SET(pa[0], regex, STRING, &cfg->szRegex);
- L2_PARAM_SET(pa[1], negate, INT, &cfg->bNegate);
+ L2_PARAM_SET(pa[0], regex, STR, &cfg->szRegex);
+ L2_PARAM_SET(pa[1], negate, INT, &cfg->bNegate);
L2_PARAM_END(pa[2]);
- if ((rv = l2_util_setparams(pa, fmt, ap)) != L2_OK)
+ l2_channel_env(ch, &env);
+ if ((rv = l2_util_setparams(env, pa, fmt, ap)) != L2_OK)
return rv;
/* translate regular expression into finite state machine */
if (cfg->szRegex != NULL) {
/* compile regular expression into FSM */
if ((cfg->pcreRegex = pcre_compile(cfg->szRegex, 0, &szError, &nErrorOffset, NULL)) == NULL) {
- l2_channel_env(ch, &env);
l2_env_errorinfo(env, L2_ERR_ARG, "%s ('%c')", szError, cfg->szRegex[nErrorOffset]);
return L2_ERR_ARG;
}
@@ -89,7 +89,6 @@
if (szError != NULL) {
free(cfg->pcreRegex);
cfg->pcreRegex = NULL;
- l2_channel_env(ch, &env);
l2_env_errorinfo(env, L2_ERR_ARG, "%s", szError);
return L2_ERR_ARG;
}
|
