OSSP CVS Repository

ossp - Difference in ossp-pkg/l2/l2_ch_filter.c versions 1.11 and 1.12
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [History

ossp-pkg/l2/l2_ch_filter.c 1.11 -> 1.12

--- l2_ch_filter.c       2001/11/03 22:51:36     1.11
+++ l2_ch_filter.c       2001/11/04 13:21:17     1.12
@@ -63,6 +63,7 @@
 static l2_result_t hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap)
 {
     l2_ch_filter_t *cfg = (l2_ch_filter_t *)ctx->vp;
+    l2_env_t *env;
     l2_param_t pa[3]; 
     l2_result_t rv;
     const char *szError;
@@ -79,7 +80,8 @@
     if (cfg->szRegex != NULL) {
         /* compile regular expression into FSM */
         if ((cfg->pcreRegex = pcre_compile(cfg->szRegex, 0, &szError, &nErrorOffset, NULL)) == NULL) {
-            l2_channel_errorinfo(ch, L2_ERR_ARG, "%s ('%c')", szError, cfg->szRegex[nErrorOffset]);
+            l2_channel_env(ch, &env);
+            l2_env_errorinfo(env, L2_ERR_ARG, "%s ('%c')", szError, cfg->szRegex[nErrorOffset]);
             return L2_ERR_ARG;
         }
         /* study FSM for more performance */
@@ -87,7 +89,8 @@
         if (szError != NULL) {
             free(cfg->pcreRegex);
             cfg->pcreRegex = NULL;
-            l2_channel_errorinfo(ch, L2_ERR_ARG, "%s", szError);
+            l2_channel_env(ch, &env);
+            l2_env_errorinfo(env, L2_ERR_ARG, "%s", szError);
             return L2_ERR_ARG;
         }
     }

CVSTrac 2.0.1