diff options
author | SVN Migration <svn@php.net> | 2004-01-25 12:03:25 +0000 |
---|---|---|
committer | SVN Migration <svn@php.net> | 2004-01-25 12:03:25 +0000 |
commit | 22476b36ce621bdd115493bab84cbe706e422a7c (patch) | |
tree | 1124d1c5af68860a78c2252bb0dac63c9f18156e /ext/mbstring/oniguruma/re.c.168.patch | |
parent | eb7aca4ea896b09cb9afc2466a46f4720acc4a4e (diff) | |
download | php-git-php_ibase_before_split.tar.gz |
This commit was manufactured by cvs2svn to create tagphp_ibase_before_split
'php_ibase_before_split'.
Diffstat (limited to 'ext/mbstring/oniguruma/re.c.168.patch')
-rw-r--r-- | ext/mbstring/oniguruma/re.c.168.patch | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/ext/mbstring/oniguruma/re.c.168.patch b/ext/mbstring/oniguruma/re.c.168.patch deleted file mode 100644 index fd1c1bf5d8..0000000000 --- a/ext/mbstring/oniguruma/re.c.168.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- re.c.ruby_orig Tue Feb 4 15:52:29 2003 -+++ re.c Tue Mar 18 19:37:49 2003 -@@ -380,7 +380,8 @@ make_regexp(s, len, flag) - int len, flag; - { - Regexp *rp; -- char *err; -+ char err[REG_MAX_ERROR_MESSAGE_LEN]; -+ int r; - - /* Handle escaped characters first. */ - -@@ -389,16 +390,17 @@ make_regexp(s, len, flag) - from that. - */ - -- rp = ALLOC(Regexp); -- MEMZERO((char *)rp, Regexp, 1); -- rp->buffer = ALLOC_N(char, 16); -- rp->allocated = 16; -- rp->fastmap = ALLOC_N(char, 256); -+ r = re_alloc_pattern(&rp); -+ if (r) { -+ re_error_code_to_str(err, r); -+ rb_reg_raise(s, len, err, 0); -+ } -+ - if (flag) { - rp->options = flag; - } -- err = re_compile_pattern(s, len, rp); -- if (err != NULL) { -+ r = re_compile_pattern(s, len, rp, err); -+ if (r != 0) { - rb_reg_raise(s, len, err, 0); - } - -@@ -532,14 +534,14 @@ rb_reg_prepare_re(re) - } - - if (need_recompile) { -- char *err; -+ char err[REG_MAX_ERROR_MESSAGE_LEN]; -+ int r; - - if (FL_TEST(re, KCODE_FIXED)) - kcode_set_option(re); - rb_reg_check(re); -- RREGEXP(re)->ptr->fastmap_accurate = 0; -- err = re_compile_pattern(RREGEXP(re)->str, RREGEXP(re)->len, RREGEXP(re)->ptr); -- if (err != NULL) { -+ r = re_recompile_pattern(RREGEXP(re)->str, RREGEXP(re)->len, RREGEXP(re)->ptr, err); -+ if (r != 0) { - rb_reg_raise(RREGEXP(re)->str, RREGEXP(re)->len, err, re); - } - } |