summaryrefslogtreecommitdiff
path: root/ext/stringio
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-04-08 07:50:49 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-04-08 07:50:49 +0000
commit653b4248a306685e0cdd86bf46c27a0ef03f9c7c (patch)
tree9d5c659dd533127bf7cd6cb58e30b00da204ca9d /ext/stringio
parent4ca9e7d03a90b4a703564d1e5288f1b94c797e7a (diff)
* ext/stringio/stringio.c (strio_getline): check whether str is
a string when str and lim are given. https://twitter.com/watson1978/status/56225052152168449 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/stringio')
-rw-r--r--ext/stringio/stringio.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c
index 594813c..da4eb96 100644
--- a/ext/stringio/stringio.c
+++ b/ext/stringio/stringio.c
@@ -921,18 +921,17 @@ strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
{
const char *s, *e, *p;
long n, limit = 0;
- VALUE str;
+ VALUE str, lim;
- if (argc == 0) {
+ rb_scan_args(argc, argv, "02", &str, &lim);
+ switch (argc) {
+ case 0:
str = rb_rs;
- }
- else {
- VALUE lim, tmp;
+ break;
- rb_scan_args(argc, argv, "11", &str, &lim);
- if (!NIL_P(lim)) limit = NUM2LONG(lim);
- else if (!NIL_P(str) && TYPE(str) != T_STRING) {
- tmp = rb_check_string_type(str);
+ case 1:
+ if (!NIL_P(str) && TYPE(str) != T_STRING) {
+ VALUE tmp = rb_check_string_type(str);
if (NIL_P(tmp)) {
limit = NUM2LONG(str);
if (limit == 0) return rb_str_new(0,0);
@@ -942,9 +941,12 @@ strio_getline(int argc, VALUE *argv, struct StringIO *ptr)
str = tmp;
}
}
- else if (!NIL_P(str)) {
- StringValue(str);
- }
+ break;
+
+ case 2:
+ if (!NIL_P(str)) StringValue(str);
+ limit = NUM2LONG(lim);
+ break;
}
if (ptr->pos >= (n = RSTRING_LEN(ptr->string))) {