From 4a3970c2118e2c4a4558431886dde02cd7ad5b7e Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 8 Mar 2013 05:47:52 +0000 Subject: load.c: reorder conditions * 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 --- load.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/load.c b/load.c index ea22d5bebd..9fbbff3f95 100644 --- a/load.c +++ b/load.c @@ -297,10 +297,13 @@ loaded_feature_path(const char *name, long vlen, const char *feature, long len, return 0; plen = e - name - len - 1; } - if (type == 's' && !IS_DLEXT(&name[plen+len+1]) - || type == 'r' && !IS_RBEXT(&name[plen+len+1]) - || name[plen] != '/') { - return 0; + if (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 (possibly empty) and prefix is some string of length plen. */ -- cgit v1.2.3