summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-31 02:43:17 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-08-31 02:43:17 +0000
commit5757a872c44cfb0a3abf1eb38e5871fa0af09a4f (patch)
tree8e78726ce23bd5d674a1548b115af2994754aa91
parentd9c5f88abc3377351d2bb8d065113dd0f1eba205 (diff)
* ext/strscan/strscan.c (strscan_do_scan): fix usecnt decrement.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog14
-rw-r--r--ext/strscan/strscan.c2
2 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 1efab6958d..9c38c9a7be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Aug 31 11:39:21 2008 Tanaka Akira <akr@fsij.org>
+
+ * ext/strscan/strscan.c (strscan_do_scan): fix usecnt decrement.
+
Sun Aug 31 04:38:47 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (econv_putback): make max argument optional.
@@ -304,7 +308,7 @@ Thu Aug 28 21:43:05 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c, include/ruby/win32.h (rb_w32_pipe): overlapped pipe
I/O support.
- * wn32/win32.c (rb_w32_read, rb_w32_write): overlapped I/O support to
+ * win32/win32.c (rb_w32_read, rb_w32_write): overlapped I/O support to
enable canceling I/O.
* thread_win32.c (ubf_handle): remove workaround.
@@ -369,7 +373,7 @@ Wed Aug 27 14:45:34 2008 NARUSE, Yui <naruse@ruby-lang.org>
Wed Aug 27 10:34:42 2008 NARUSE, Yui <naruse@ruby-lang.org>
- * lib/cgi.rb (CGI::Cookie): remove delagate.
+ * lib/cgi.rb (CGI::Cookie): remove delegate.
Patch by Takeyuki Fujioka. [ruby-dev:35995]
* test/cgi/test_cgi_cookie.rb: added for above.
@@ -607,7 +611,7 @@ Mon Aug 25 17:36:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
Mon Aug 25 14:22:21 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* parse.y (YYSTYPE): struct RVarmap has been no longer
- defnied.
+ defined.
see also r11717 by matz.
Mon Aug 25 10:42:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
@@ -828,7 +832,7 @@ Sun Aug 24 10:55:00 2008 NARUSE, Yui <naruse@ruby-lang.org>
Sun Aug 24 08:03:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
- * strftime.c (daylight, timezone): not provied as dllexport on cygwin,
+ * strftime.c (daylight, timezone): not provided as dllexport on cygwin,
right now.
Sun Aug 24 06:39:05 2008 NARUSE, Yui <naruse@ruby-lang.org>
@@ -997,7 +1001,7 @@ Fri Aug 22 21:18:40 2008 Tadayoshi Funaba <tadf@dotrb.org>
* include/ruby/intern.h: added a declaration.
- * lib/complex.rb: added an obsolate class method.
+ * lib/complex.rb: added an obsolete class method.
* lib/cmath.rb: use scalar? instead of generic?.
diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c
index 6f05ec3666..6b0d8e7c52 100644
--- a/ext/strscan/strscan.c
+++ b/ext/strscan/strscan.c
@@ -431,7 +431,7 @@ strscan_do_scan(VALUE self, VALUE regex, int succptr, int getstr, int headonly)
(UChar* )CURPTR(p), (UChar* )(CURPTR(p) + S_RESTLEN(p)),
&(p->regs), ONIG_OPTION_NONE);
}
- if (!tmpreg) RREGEXP(re)->usecnt--;
+ if (!tmpreg) RREGEXP(regex)->usecnt--;
if (tmpreg) {
if (RREGEXP(regex)->usecnt) {
onig_free(re);