diff options
| author | Nicholas Clark <nick@ccl4.org> | 2010-10-21 12:27:54 +0200 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2010-10-21 12:27:54 +0200 |
| commit | a4051d2977a92b90787a41f76f3ae82ad6401d66 (patch) | |
| tree | 7e5804c7b148e73304e0fb3b9816354166fbf044 /ext/NDBM_File | |
| parent | f4603e303c60a90bd9050fdc96683a33e69bb849 (diff) | |
| download | perl-a4051d2977a92b90787a41f76f3ae82ad6401d66.tar.gz | |
In [GNO]DBM_File.xs, store the 4 filter functions as 1 array in the struct.
Previously they were 1 distinct members. Using an array allows the use of a
in *_DESTROY, and merging of the 4 XS functions filter_{fetch,store}_{key,value}
into 1 body with ALIASes.
Diffstat (limited to 'ext/NDBM_File')
| -rw-r--r-- | ext/NDBM_File/NDBM_File.xs | 56 | ||||
| -rw-r--r-- | ext/NDBM_File/typemap | 8 |
2 files changed, 22 insertions, 42 deletions
diff --git a/ext/NDBM_File/NDBM_File.xs b/ext/NDBM_File/NDBM_File.xs index 34c4b59829..af8f02f674 100644 --- a/ext/NDBM_File/NDBM_File.xs +++ b/ext/NDBM_File/NDBM_File.xs @@ -25,12 +25,14 @@ START_EXTERN_C END_EXTERN_C #endif +#define fetch_key 0 +#define store_key 1 +#define fetch_value 2 +#define store_value 3 + typedef struct { DBM * dbp ; - SV * filter_fetch_key ; - SV * filter_store_key ; - SV * filter_fetch_value ; - SV * filter_store_value ; + SV * filter[4]; int filtering ; } NDBM_File_type; @@ -77,16 +79,14 @@ ndbm_TIEHASH(dbtype, filename, flags, mode) void ndbm_DESTROY(db) NDBM_File db + PREINIT: + int i = store_value; CODE: dbm_close(db->dbp); - if (db->filter_fetch_key) - SvREFCNT_dec(db->filter_fetch_key) ; - if (db->filter_store_key) - SvREFCNT_dec(db->filter_store_key) ; - if (db->filter_fetch_value) - SvREFCNT_dec(db->filter_fetch_value) ; - if (db->filter_store_value) - SvREFCNT_dec(db->filter_store_value) ; + do { + if (db->filter[i]) + SvREFCNT_dec(db->filter[i]); + } while (i-- > 0); safefree(db); #define ndbm_FETCH(db,key) dbm_fetch(db->dbp,key) @@ -144,30 +144,10 @@ filter_fetch_key(db, code) NDBM_File db SV * code SV * RETVAL = &PL_sv_undef ; + ALIAS: + NDBM_File::filter_fetch_key = fetch_key + NDBM_File::filter_store_key = store_key + NDBM_File::filter_fetch_value = fetch_value + NDBM_File::filter_store_value = store_value CODE: - DBM_setFilter(db->filter_fetch_key, code) ; - -SV * -filter_store_key(db, code) - NDBM_File db - SV * code - SV * RETVAL = &PL_sv_undef ; - CODE: - DBM_setFilter(db->filter_store_key, code) ; - -SV * -filter_fetch_value(db, code) - NDBM_File db - SV * code - SV * RETVAL = &PL_sv_undef ; - CODE: - DBM_setFilter(db->filter_fetch_value, code) ; - -SV * -filter_store_value(db, code) - NDBM_File db - SV * code - SV * RETVAL = &PL_sv_undef ; - CODE: - DBM_setFilter(db->filter_store_value, code) ; - + DBM_setFilter(db->filter[ix], code); diff --git a/ext/NDBM_File/typemap b/ext/NDBM_File/typemap index ad62e0aaf2..bb741e4ee7 100644 --- a/ext/NDBM_File/typemap +++ b/ext/NDBM_File/typemap @@ -17,12 +17,12 @@ INPUT T_DATUM_K { STRLEN len; - DBM_ckFilter($arg, filter_store_key, \"filter_store_key\"); + DBM_ckFilter($arg, filter[store_key], \"filter_store_key\"); $var.dptr = SvPVbyte($arg, len); $var.dsize = (int)len; } T_DATUM_V - DBM_ckFilter($arg, filter_store_value, \"filter_store_value\"); + DBM_ckFilter($arg, filter[store_value], \"filter_store_value\"); if (SvOK($arg)) { STRLEN len; $var.dptr = SvPVbyte($arg, len); @@ -37,10 +37,10 @@ T_GDATUM OUTPUT T_DATUM_K sv_setpvn($arg, (char *)$var.dptr, $var.dsize); - DBM_ckFilter($arg, filter_fetch_key, \"filter_fetch_key\"); + DBM_ckFilter($arg, filter[fetch_key], \"filter_fetch_key\"); T_DATUM_V sv_setpvn($arg, (char *)$var.dptr, $var.dsize); - DBM_ckFilter($arg, filter_fetch_value, \"filter_fetch_value\"); + DBM_ckFilter($arg, filter[fetch_value], \"filter_fetch_value\"); T_GDATUM sv_usepvn($arg, $var.dptr, $var.dsize); T_PTROBJ |