From c506f190e142ad8cda2be386180c51d428a937fc Mon Sep 17 00:00:00 2001 From: naruse Date: Sun, 11 Oct 2009 00:48:35 +0000 Subject: * regerror.c (onig_vsnprintf_with_pattern): added. * regparse.c (onig_syntax_warn): use above. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25295 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- regparse.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'regparse.c') diff --git a/regparse.c b/regparse.c index 8bd89e1fb6..0a6bf199c1 100644 --- a/regparse.c +++ b/regparse.c @@ -2844,20 +2844,23 @@ fetch_name(OnigCodePoint start_code, UChar** src, UChar* end, } #endif /* USE_NAMED_GROUP */ +void onig_vsnprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc, + UChar* pat, UChar* pat_end, const UChar *fmt, va_list args); + static void onig_syntax_warn(ScanEnv *env, const char *fmt, ...) { va_list args; UChar buf[WARN_BUFSIZE]; va_start(args, fmt); - onig_snprintf_with_pattern(buf, WARN_BUFSIZE, env->enc, + onig_vsnprintf_with_pattern(buf, WARN_BUFSIZE, env->enc, env->pattern, env->pattern_end, (const UChar *)fmt, args); va_end(args); if (env->sourcefile == NULL) - rb_warn(fmt, buf); + rb_warn((char *)buf); else - rb_compile_warn(env->sourcefile, env->sourceline, fmt, buf); + rb_compile_warn(env->sourcefile, env->sourceline, (char *)buf); } static void -- cgit v1.2.3