From f895ecdceec45c8213ec0fc1a0d8b75e11fb545d Mon Sep 17 00:00:00 2001 From: suke Date: Fri, 3 Oct 2014 21:08:55 +0000 Subject: ext/win32ole/win32ole_method.c(olemethod_set_member): remove redundant NULL check. ext/win32ole/win32ole_type.c(oletype_set_member): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47779 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/win32ole/win32ole_method.c | 2 +- ext/win32ole/win32ole_type.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 024330adf9..a6876ee329 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Oct 4 06:04:56 2014 Masaki Suketa + + * ext/win32ole/win32ole_method.c(olemethod_set_member): remove + redundant NULL check. + * ext/win32ole/win32ole_type.c(oletype_set_member): ditto. + Sat Oct 4 00:25:04 2014 SHIBATA Hiroshi * .travis.yml: removed needless preparation for gcc. diff --git a/ext/win32ole/win32ole_method.c b/ext/win32ole/win32ole_method.c index 672ec5c0e0..051ba429c9 100644 --- a/ext/win32ole/win32ole_method.c +++ b/ext/win32ole/win32ole_method.c @@ -207,7 +207,7 @@ olemethod_set_member(VALUE self, ITypeInfo *pTypeInfo, ITypeInfo *pOwnerTypeInfo pmethod->pTypeInfo = pTypeInfo; OLE_ADDREF(pTypeInfo); pmethod->pOwnerTypeInfo = pOwnerTypeInfo; - if(pOwnerTypeInfo) OLE_ADDREF(pOwnerTypeInfo); + OLE_ADDREF(pOwnerTypeInfo); pmethod->index = index; rb_ivar_set(self, rb_intern("name"), name); return self; diff --git a/ext/win32ole/win32ole_type.c b/ext/win32ole/win32ole_type.c index d2dbb3a588..c5ae53c3aa 100644 --- a/ext/win32ole/win32ole_type.c +++ b/ext/win32ole/win32ole_type.c @@ -188,7 +188,7 @@ oletype_set_member(VALUE self, ITypeInfo *pTypeInfo, VALUE name) TypedData_Get_Struct(self, struct oletypedata, &oletype_datatype, ptype); rb_ivar_set(self, rb_intern("name"), name); ptype->pTypeInfo = pTypeInfo; - if(pTypeInfo) OLE_ADDREF(pTypeInfo); + OLE_ADDREF(pTypeInfo); return self; } -- cgit v1.2.3