From dd53157c9e1b352de0e7f41a863aeaf6ba298724 Mon Sep 17 00:00:00 2001 From: rhe Date: Sun, 22 Oct 2017 07:18:55 +0000 Subject: gdbm, dbm, sdbm: remove unnecessary conditions The dfree and dsize callback functions are never called with NULL. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60356 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/gdbm/gdbm.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'ext/gdbm') diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c index 2aa9010c57..85e2b33f31 100644 --- a/ext/gdbm/gdbm.c +++ b/ext/gdbm/gdbm.c @@ -114,21 +114,18 @@ static void free_dbm(void *ptr) { struct dbmdata *dbmp = ptr; - if (dbmp) { - if (dbmp->di_dbm) gdbm_close(dbmp->di_dbm); - xfree(dbmp); - } + if (dbmp->di_dbm) + gdbm_close(dbmp->di_dbm); + xfree(dbmp); } static size_t memsize_dbm(const void *ptr) { - size_t size = 0; const struct dbmdata *dbmp = ptr; - if (dbmp) { - size += sizeof(*dbmp); - if (dbmp->di_dbm) size += DBM_SIZEOF_DBM; - } + size_t size = sizeof(*dbmp); + if (dbmp->di_dbm) + size += DBM_SIZEOF_DBM; return size; } -- cgit v1.2.3