From db8dcd1b27064c5c9b203f311ff209c7051c8a7c Mon Sep 17 00:00:00 2001 From: suke Date: Sun, 27 Dec 2015 14:34:11 +0000 Subject: * ext/win32ole/win32ole.c (ole_variant2val): refactoring. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/win32ole/win32ole.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'ext') diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index ac3c2a6a73..ac02b66a88 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -1574,16 +1574,14 @@ ole_variant2val(VARIANT *pvar) case VT_BSTR: { - if(V_ISBYREF(pvar)) { - obj = (SysStringLen(*V_BSTRREF(pvar)) == 0) - ? rb_str_new2("") - : ole_wc2vstr(*V_BSTRREF(pvar), FALSE); - } - else { - obj = (SysStringLen(V_BSTR(pvar)) == 0) - ? rb_str_new2("") - : ole_wc2vstr(V_BSTR(pvar), FALSE); - } + BSTR bstr; + if(V_ISBYREF(pvar)) + bstr = *V_BSTRREF(pvar); + else + bstr = V_BSTR(pvar); + obj = (SysStringLen(bstr) == 0) + ? rb_str_new2("") + : ole_wc2vstr(bstr, FALSE); break; } -- cgit v1.2.3