From 15741e262eeb78546daf6555da07141d2cc7aaa6 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 30 Apr 2005 04:11:33 +0000 Subject: [PATCH] * ext/stringio/stringio.c (strio_getline): suppress warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/stringio/stringio.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index 9d16b235dd..db93c1ff89 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -863,8 +863,7 @@ strio_getline(argc, argv, ptr) } } s = p; - while (p = memchr(p, '\n', e - p)) { - if (p == e) break; + while ((p = memchr(p, '\n', e - p)) && (p != e)) { if (*++p == '\n') { e = p; break; @@ -873,7 +872,7 @@ strio_getline(argc, argv, ptr) str = rb_str_substr(ptr->string, s - RSTRING(ptr->string)->ptr, e - s); } else if (n == 1) { - if (p = memchr(s, RSTRING(str)->ptr[0], e - s)) { + if ((p = memchr(s, RSTRING(str)->ptr[0], e - s)) != 0) { e = p + 1; } str = rb_str_substr(ptr->string, ptr->pos, e - s);