From 5f8e2d383b1252be4acbac6d50177acd8e79dff9 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 5 Aug 2016 08:04:04 +0000 Subject: hash.c: call w32_getenv pointer * hash.c (w32_getenv): call rb_w32_getenv and rb_w32_ugetenv via this pointer without further comparisons. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- hash.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'hash.c') diff --git a/hash.c b/hash.c index d6bfc8a613..3af376255e 100644 --- a/hash.c +++ b/hash.c @@ -2896,17 +2896,21 @@ static char **my_environ; #undef environ #define environ my_environ #undef getenv -static inline char * -w32_getenv(const char *name) +static char *(*w32_getenv)(const char*); +static char * +w32_getenv_unknown(const char *name) { - static int binary = -1; - static int locale = -1; - if (binary < 0) { - binary = rb_ascii8bit_encindex(); - locale = rb_locale_encindex(); + char *(*func)(const char*); + if (rb_locale_encindex() == rb_ascii8bit_encindex()) { + func = rb_w32_getenv; } - return locale == binary ? rb_w32_getenv(name) : rb_w32_ugetenv(name); + else { + func = rb_w32_ugetenv; + } + /* atomic assignment in flat memory model */ + return (w32_getenv = func)(name); } +static char *(*w32_getenv)(const char*) = w32_getenv_unknown; #define getenv(n) w32_getenv(n) #elif defined(__APPLE__) #undef environ -- cgit v1.2.3