diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-11 00:48:35 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-11 00:48:35 +0000 |
| commit | c8b96db21872699380bf61f34fb1f2550cceafdc (patch) | |
| tree | c52bde6924eaa562e434a01ef2cdc83b06e8bd8b /regparse.c | |
| parent | c118aee7ee5718110c83caa8d5ce3f91f6bc9ed4 (diff) | |
| download | ruby-c8b96db21872699380bf61f34fb1f2550cceafdc.tar.gz ruby-c8b96db21872699380bf61f34fb1f2550cceafdc.tar.xz ruby-c8b96db21872699380bf61f34fb1f2550cceafdc.zip | |
* regerror.c (onig_vsnprintf_with_pattern): added.
* regparse.c (onig_syntax_warn): use above.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25295 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regparse.c')
| -rw-r--r-- | regparse.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/regparse.c b/regparse.c index 8bd89e1fb..0a6bf199c 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 |