kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

gdbm, dbm, sdbm: remove unnecessary conditions

Browse source 
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
This commit is contained in:
rhe 2017-10-22 07:18:55 +00:00
parent de7a010a50
commit dd53157c9e
3 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ext/dbm/dbm.c
View file

@ -59,21 +59,18 @@ static void
free_dbm(void *ptr) free_dbm(void *ptr)
{ {
struct dbmdata *dbmp = ptr; struct dbmdata *dbmp = ptr;
if (dbmp) { if (dbmp->di_dbm)
if (dbmp->di_dbm) dbm_close(dbmp->di_dbm); dbm_close(dbmp->di_dbm);
xfree(dbmp); xfree(dbmp);
}
} }
static size_t static size_t
memsize_dbm(const void *ptr) memsize_dbm(const void *ptr)
{ {
size_t size = 0;
const struct dbmdata *dbmp = ptr; const struct dbmdata *dbmp = ptr;
if (dbmp) { size_t size = sizeof(*dbmp);
size += sizeof(*dbmp); if (dbmp->di_dbm)
if (dbmp->di_dbm) size += DBM_SIZEOF_DBM; size += DBM_SIZEOF_DBM;
}
return size; return size;
} }

15
ext/gdbm/gdbm.c
View file

@ -114,21 +114,18 @@ static void
free_dbm(void *ptr) free_dbm(void *ptr)
{ {
struct dbmdata *dbmp = ptr; struct dbmdata *dbmp = ptr;
if (dbmp) { if (dbmp->di_dbm)
if (dbmp->di_dbm) gdbm_close(dbmp->di_dbm); gdbm_close(dbmp->di_dbm);
xfree(dbmp); xfree(dbmp);
}
} }
static size_t static size_t
memsize_dbm(const void *ptr) memsize_dbm(const void *ptr)
{ {
size_t size = 0;
const struct dbmdata *dbmp = ptr; const struct dbmdata *dbmp = ptr;
if (dbmp) { size_t size = sizeof(*dbmp);
size += sizeof(*dbmp); if (dbmp->di_dbm)
if (dbmp->di_dbm) size += DBM_SIZEOF_DBM; size += DBM_SIZEOF_DBM;
}
return size; return size;
} }

8
ext/sdbm/init.c
View file

@ -99,12 +99,10 @@ free_sdbm(void *ptr)
static size_t static size_t
memsize_dbm(const void *ptr) memsize_dbm(const void *ptr)
{ {
size_t size = 0;
const struct dbmdata *dbmp = ptr; const struct dbmdata *dbmp = ptr;
if (dbmp) { size_t size = sizeof(*dbmp);
size += sizeof(*dbmp); if (dbmp->di_dbm)
if (dbmp->di_dbm) size += sizeof(DBM); size += sizeof(DBM);
}
return size; return size;
} }