X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FSDBM_File%2Ftypemap;h=c88725bf75777dacb3f7f2f60049ef71ff1d1821;hb=2dc92170b2dd9e41c48e775084065721dadbc042;hp=73ad370359fa1d2a5c3d6a73d0fff0d3f57199c2;hpb=189b2af51bf236b53a02db0b105a3de423d3fff4;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/SDBM_File/typemap b/ext/SDBM_File/typemap
index 73ad370..c88725b 100644
--- a/ext/SDBM_File/typemap
+++ b/ext/SDBM_File/typemap
@@ -2,7 +2,8 @@
 #################################### DBM SECTION
 #
 
-datum			T_DATUM
+datum_key		T_DATUM_K
+datum_value		T_DATUM_V
 gdatum			T_GDATUM
 NDBM_File		T_PTROBJ
 GDBM_File		T_PTROBJ
@@ -13,15 +14,30 @@ DBZ_File		T_PTROBJ
 FATALFUNC		T_OPAQUEPTR
 
 INPUT
-T_DATUM
-	$var.dptr = SvPV($arg, na);
-	$var.dsize = (int)na;
+T_DATUM_K
+	DBM_ckFilter($arg, filter_store_key, \"filter_store_key\");
+	$var.dptr = SvPVbyte($arg, PL_na);
+	$var.dsize = (int)PL_na;
+T_DATUM_V
+        DBM_ckFilter($arg, filter_store_value, \"filter_store_value\");
+	if (SvOK($arg)) {
+	    $var.dptr = SvPVbyte($arg, PL_na);
+	    $var.dsize = (int)PL_na;
+	}
+	else {
+	    $var.dptr = \"\";
+	    $var.dsize = 0;
+	}
 T_GDATUM
 	UNIMPLEMENTED
 OUTPUT
-T_DATUM
-	SvSetMagicPVN($arg, $var.dptr, $var.dsize);
+T_DATUM_K
+	sv_setpvn($arg, $var.dptr, $var.dsize);
+	DBM_ckFilter($arg, filter_fetch_key,\"filter_fetch_key\");
+T_DATUM_V
+	sv_setpvn($arg, $var.dptr, $var.dsize);
+	DBM_ckFilter($arg, filter_fetch_value,\"filter_fetch_value\");
 T_GDATUM
-	SvUseMagicPVN($arg, $var.dptr, $var.dsize);
+	sv_usepvn($arg, $var.dptr, $var.dsize);
 T_PTROBJ
         sv_setref_pv($arg, dbtype, (void*)$var);