mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
7b9dd379bf
commit
a74d08b957
2 changed files with 2 additions and 7 deletions
3
st.c
3
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') {
|
||||
|
|
6
util.c
6
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';
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue