diff options
| -rw-r--r-- | ext/dbm/dbm.c | 15 | ||||
| -rw-r--r-- | ext/gdbm/gdbm.c | 15 | ||||
| -rw-r--r-- | ext/sdbm/init.c | 8 |
3 files changed, 15 insertions, 23 deletions
diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c index 1f69f68a5a..4ac6898848 100644 --- a/ext/dbm/dbm.c +++ b/ext/dbm/dbm.c @@ -59,21 +59,18 @@ static void free_dbm(void *ptr) { struct dbmdata *dbmp = ptr; - if (dbmp) { - if (dbmp->di_dbm) dbm_close(dbmp->di_dbm); - xfree(dbmp); - } + if (dbmp->di_dbm) + dbm_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; } 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; } diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c index de99b07367..f28eeb2f5e 100644 --- a/ext/sdbm/init.c +++ b/ext/sdbm/init.c @@ -99,12 +99,10 @@ free_sdbm(void *ptr) 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 += sizeof(DBM); - } + size_t size = sizeof(*dbmp); + if (dbmp->di_dbm) + size += sizeof(DBM); return size; } |