diff options
author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-27 14:34:11 +0000 |
---|---|---|
committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-27 14:34:11 +0000 |
commit | 9a87dd5665fc8a2a8d127fceaa135e4208f6b1fd (patch) | |
tree | 8fb74499bd3c0b751a97832d65dcc5e3f40f324b /ext | |
parent | 885191142eb75095d68bcda5cc169ac8adbf687c (diff) | |
download | ruby-9a87dd5665fc8a2a8d127fceaa135e4208f6b1fd.tar.gz |
* ext/win32ole/win32ole.c (ole_variant2val): refactoring.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/win32ole/win32ole.c | 18 |
1 files changed, 8 insertions, 10 deletions
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; } |