X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FODBM_File%2Ftypemap;h=4f4802cfa5790a1569d438fd9c0b351f00e69d16;hb=3c83a670ef5b88bf7bcdc0857c28022b13bf2106;hp=7c23815ec75ab60a69b0219f06ee0bb46b48ffcf;hpb=9fe6733ac5627eddc014ed5f2afb208fa4afd501;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/ODBM_File/typemap b/ext/ODBM_File/typemap
index 7c23815..4f4802c 100644
--- a/ext/ODBM_File/typemap
+++ b/ext/ODBM_File/typemap
@@ -3,6 +3,7 @@
 #
 
 datum_key		T_DATUM_K
+datum_key_copy		T_DATUM_K_C
 datum_value		T_DATUM_V
 gdatum			T_GDATUM
 NDBM_File		T_PTROBJ
@@ -15,21 +16,39 @@ FATALFUNC		T_OPAQUEPTR
 
 INPUT
 T_DATUM_K
-	ckFilter($arg, filter_store_key, \"filter_store_key\");
+	DBM_ckFilter($arg, filter_store_key, \"filter_store_key\");
 	$var.dptr = SvPV($arg, PL_na);
 	$var.dsize = (int)PL_na;
+T_DATUM_K_C
+	{
+	    SV * tmpSV ;
+	    if (db->filter_store_key){
+	        tmpSV = sv_2mortal(newSVsv($arg));
+	        DBM_ckFilter(tmpSV, filter_store_key, \"filter_store_key\");
+	    }
+	    else
+		tmpSV = $arg;
+	    $var.dptr = SvPV(tmpSV, PL_na);
+	    $var.dsize = (int)PL_na;
+	}
 T_DATUM_V
-        ckFilter($arg, filter_store_value, \"filter_store_value\");
-	$var.dptr = SvPV($arg, PL_na);
-	$var.dsize = (int)PL_na;
+        DBM_ckFilter($arg, filter_store_value, \"filter_store_value\");
+	if (SvOK($arg)) {
+	    $var.dptr = SvPV($arg, PL_na);
+	    $var.dsize = (int)PL_na;
+	}
+	else {
+	    $var.dptr = \"\";
+	    $var.dsize = 0;
+	}
 T_GDATUM
 	UNIMPLEMENTED
 OUTPUT
 T_DATUM_K
 	sv_setpvn($arg, $var.dptr, $var.dsize);
-	ckFilter($arg, filter_fetch_key,\"filter_fetch_key\");
+	DBM_ckFilter($arg, filter_fetch_key,\"filter_fetch_key\");
 T_DATUM_V
 	sv_setpvn($arg, $var.dptr, $var.dsize);
-	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);