diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-05-31 15:33:20 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-05-31 15:33:20 +0900 |
| commit | 1f1ab75d754dc5f26dbf103eb6461db950895788 (patch) | |
| tree | 11d7b74778e3f9b83c91fd0f57c2143aac7b245e /src | |
| parent | 64fc4ac332eab0be7704cf6f7ec5a96c523c0ed9 (diff) | |
| download | mruby-1f1ab75d754dc5f26dbf103eb6461db950895788.tar.gz mruby-1f1ab75d754dc5f26dbf103eb6461db950895788.zip | |
resolve conflict
Diffstat (limited to 'src')
| -rw-r--r-- | src/string.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/string.c b/src/string.c index 257286144..3677da0ab 100644 --- a/src/string.c +++ b/src/string.c @@ -635,7 +635,6 @@ mrb_str_index(mrb_state *mrb, mrb_value str, mrb_value sub, mrb_int offset) slen = RSTRING_LEN(sub); len = RSTRING_LEN(str) - offset; pos = mrb_memsearch(sptr, slen, s, len); - if (pos < 0) return pos; return pos + offset; } |