summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--string.c11
2 files changed, 7 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b07a00adf..d110a8f390 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 22 00:20:33 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * string.c (rb_str_include): should not treat char as negative value.
+ [ruby-dev:24558]
+
Thu Oct 21 19:06:15 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/webrick/httpresponse.rb (WEBrick::HTTPResponse#send_body_io):
diff --git a/string.c b/string.c
index 9f0091721d..39069c9e83 100644
--- a/string.c
+++ b/string.c
@@ -2386,15 +2386,8 @@ rb_str_include(str, arg)
long i;
if (FIXNUM_P(arg)) {
- int c = FIX2INT(arg);
- long len = RSTRING(str)->len;
- char *p = RSTRING(str)->ptr;
-
- for (i=0; i<len; i++) {
- if (p[i] == c) {
- return Qtrue;
- }
- }
+ if (memchr(RSTRING(str)->ptr, FIX2INT(arg), RSTRING(str)->len))
+ return Qtrue;
return Qfalse;
}