abolish warnings by previous change.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14830 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-01-01 13:19:21 +00:00
Родитель 041e829127
Коммит e3e49960e0
1 изменённых файлов: 10 добавлений и 15 удалений

25
st.c
Просмотреть файл

@ -869,8 +869,11 @@ st_strcasecmp(const char *s1, const char *s2)
while (1) {
c1 = (unsigned char)*s1++;
c2 = (unsigned char)*s2++;
if (!c1) break;
if (!c2) break;
if (c1 == '\0' || c2 == '\0') {
if (c1 != '\0') return 1;
if (c2 != '\0') return -1;
return 0;
}
if ((unsigned int)(c1 - 'A') <= ('Z' - 'A')) c1 += 'a' - 'A';
if ((unsigned int)(c2 - 'A') <= ('Z' - 'A')) c2 += 'a' - 'A';
if (c1 != c2) {
@ -880,11 +883,6 @@ st_strcasecmp(const char *s1, const char *s2)
return -1;
}
}
if (c1 != '\0')
return 1;
if (c2 != '\0')
return -1;
return 0;
}
int
@ -895,8 +893,11 @@ st_strncasecmp(const char *s1, const char *s2, size_t n)
while (n--) {
c1 = (unsigned char)*s1++;
c2 = (unsigned char)*s2++;
if (!c1) break;
if (!c2) break;
if (c1 == '\0' || c2 == '\0') {
if (c1 != '\0') return 1;
if (c2 != '\0') return -1;
return 0;
}
if ((unsigned int)(c1 - 'A') <= ('Z' - 'A')) c1 += 'a' - 'A';
if ((unsigned int)(c2 - 'A') <= ('Z' - 'A')) c2 += 'a' - 'A';
if (c1 != c2) {
@ -906,12 +907,6 @@ st_strncasecmp(const char *s1, const char *s2, size_t n)
return -1;
}
}
if (n == 0)
return 0;
if (c1 != '\0')
return 1;
if (c2 != '\0')
return -1;
return 0;
}