* load.c (loaded_feature_path): reorder conditions so simple
  comparision comes first.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39637 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-03-08 05:47:52 +00:00
Родитель d415f2abac
Коммит 4a3970c211
1 изменённых файлов: 7 добавлений и 4 удалений

11
load.c
Просмотреть файл

@ -297,10 +297,13 @@ loaded_feature_path(const char *name, long vlen, const char *feature, long len,
return 0; return 0;
plen = e - name - len - 1; plen = e - name - len - 1;
} }
if (type == 's' && !IS_DLEXT(&name[plen+len+1]) if (name[plen] != '/') {
|| type == 'r' && !IS_RBEXT(&name[plen+len+1]) return 0;
|| name[plen] != '/') { }
return 0; if (type == 's' ? !IS_DLEXT(&name[plen+len+1]) :
type == 'r' ? !IS_RBEXT(&name[plen+len+1]) :
0) {
return 0;
} }
/* Now name == "#{prefix}/#{feature}#{ext}" where ext is acceptable /* Now name == "#{prefix}/#{feature}#{ext}" where ext is acceptable
(possibly empty) and prefix is some string of length plen. */ (possibly empty) and prefix is some string of length plen. */