diff options
Diffstat (limited to 'ext/gdbm/gdbm.c')
| -rw-r--r-- | ext/gdbm/gdbm.c | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c index 851afea497..a8f75b27d1 100644 --- a/ext/gdbm/gdbm.c +++ b/ext/gdbm/gdbm.c @@ -101,7 +101,7 @@ closed_dbm(void) } #define GetDBM(obj, dbmp) do {\ - Data_Get_Struct((obj), struct dbmdata, (dbmp));\ + TypedData_Get_Struct((obj), struct dbmdata, &dbm_type, (dbmp));\ if ((dbmp) == 0) closed_dbm();\ if ((dbmp)->di_dbm == 0) closed_dbm();\ } while (0) @@ -112,14 +112,34 @@ closed_dbm(void) } while (0) static void -free_dbm(struct dbmdata *dbmp) +free_dbm(void *ptr) { + struct dbmdata *dbmp = ptr; if (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; + } + return size; +} + +static const rb_data_type_t dbm_type = { + "gdbm", + {0, free_dbm, memsize_dbm,}, + NULL, NULL, + RUBY_TYPED_FREE_IMMEDIATELY, +}; + /* * call-seq: * gdbm.close -> nil @@ -149,7 +169,7 @@ fgdbm_closed(VALUE obj) { struct dbmdata *dbmp; - Data_Get_Struct(obj, struct dbmdata, dbmp); + TypedData_Get_Struct(obj, struct dbmdata, &dbm_type, dbmp); if (dbmp == 0) return Qtrue; if (dbmp->di_dbm == 0) @@ -161,7 +181,7 @@ fgdbm_closed(VALUE obj) static VALUE fgdbm_s_alloc(VALUE klass) { - return Data_Wrap_Struct(klass, 0, free_dbm, 0); + return TypedData_Wrap_Struct(klass, &dbm_type, 0); } /* @@ -279,7 +299,7 @@ fgdbm_initialize(int argc, VALUE *argv, VALUE obj) static VALUE fgdbm_s_open(int argc, VALUE *argv, VALUE klass) { - VALUE obj = Data_Wrap_Struct(klass, 0, free_dbm, 0); + VALUE obj = fgdbm_s_alloc(klass); if (NIL_P(fgdbm_initialize(argc, argv, obj))) { return Qnil; |