From a74d08b957b9896e69bde1c9f571fdc5022fbdfb Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 8 Nov 2018 05:34:58 +0000
Subject: svn merge -r 65625:65623 .

Was breaking make test-all


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65627 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 st.c   | 3 +--
 util.c | 6 +-----
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/st.c b/st.c
index 77d998f9fc..ee3dbb125d 100644
--- a/st.c
+++ b/st.c
@@ -2036,9 +2036,8 @@ int
 st_locale_insensitive_strncasecmp(const char *s1, const char *s2, size_t n)
 {
     char c1, c2;
-    size_t i;
 
-    for (i = 0; i < n; i++) {
+    while (n--) {
         c1 = *s1++;
         c2 = *s2++;
         if (c1 == '\0' || c2 == '\0') {
diff --git a/util.c b/util.c
index 1d95da98bb..0e49e4439d 100644
--- a/util.c
+++ b/util.c
@@ -35,12 +35,8 @@ ruby_scan_oct(const char *start, size_t len, size_t *retlen)
 {
     register const char *s = start;
     register unsigned long retval = 0;
-    size_t i;
 
-    for (i = 0; i < len; i++) {
-        if ((s[0] < '0') || ('7' <= s[0])) {
-            break;
-        }
+    while (len-- && *s >= '0' && *s <= '7') {
 	retval <<= 3;
 	retval |= *s++ - '0';
     }
-- 
cgit v1.2.1