summaryrefslogtreecommitdiff
path: root/re.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-22 13:49:43 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-22 13:49:43 +0000
commit89c408704bc7034c06cb465ad8ba9b25f32de301 (patch)
tree8376886d19205bc98aa080934adb39a59d797a86 /re.c
parentf07ca6b1c40fdeb2f37e6e425b0f667a1cae8cdb (diff)
* enumerator.c (enumerator_each, enumerator_with_index): suppress
warnings. * pack.c (pack_unpack): ditto. * process.c (rb_syswait): ditto. * re.c (rb_reg_prepare_enc, rb_reg_prepare_re, rb_reg_adjust_startpos): ditto. * regparse.c (onig_name_to_group_numbers): ditto. * missing/vsnprintf.c (BSD_vfprintf): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16156 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 're.c')
-rw-r--r--re.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/re.c b/re.c
index c869216da2..ed8aa8c453 100644
--- a/re.c
+++ b/re.c
@@ -1150,7 +1150,6 @@ static rb_encoding*
rb_reg_prepare_enc(VALUE re, VALUE str, int warn)
{
rb_encoding *enc = 0;
- regex_t *reg;
if (rb_enc_str_coderange(str) == ENC_CODERANGE_BROKEN) {
rb_raise(rb_eArgError,
@@ -1189,7 +1188,7 @@ rb_reg_prepare_re(VALUE re, rb_encoding *enc)
onig_errmsg_buffer err = "";
int r;
OnigErrorInfo einfo;
- UChar *pattern;
+ const char *pattern;
VALUE unescaped;
rb_encoding *fixed_enc = 0;
@@ -1197,7 +1196,7 @@ rb_reg_prepare_re(VALUE re, rb_encoding *enc)
rb_reg_check(re);
reg = RREGEXP(re)->ptr;
- pattern = ((UChar*)RREGEXP(re)->str);
+ pattern = RREGEXP(re)->str;
unescaped = rb_reg_preprocess(
pattern, pattern + RREGEXP(re)->len, enc,
@@ -1213,7 +1212,7 @@ rb_reg_prepare_re(VALUE re, rb_encoding *enc)
OnigDefaultSyntax, &einfo);
if (r) {
onig_error_code_to_str((UChar*)err, r, &einfo);
- rb_reg_raise((char*)pattern, RREGEXP(re)->len, err, re);
+ rb_reg_raise(pattern, RREGEXP(re)->len, err, re);
}
RB_GC_GUARD(unescaped);
@@ -1226,7 +1225,6 @@ rb_reg_adjust_startpos(VALUE re, VALUE str, int pos, int reverse)
int range;
rb_encoding *enc;
UChar *p, *string;
- regex_t *reg;
enc = rb_reg_prepare_enc(re, str, 0);