X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FODBM_File%2Ftypemap;h=68313c346e90074916bc215df34bb5b545ed3b47;hb=61699fd9cff97058aa916fa11f87bf31bdcef194;hp=096427ea7f3a487f98a90dbc8af471db6922873a;hpb=0e06870bf080a38cda51c06c6612359afc2334e1;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/ODBM_File/typemap b/ext/ODBM_File/typemap
index 096427e..68313c3 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,14 +16,31 @@ FATALFUNC		T_OPAQUEPTR
 
 INPUT
 T_DATUM_K
-	ckFilter($arg, filter_store_key, \"filter_store_key\");
-	$var.dptr = SvPV($arg, PL_na);
-	$var.dsize = (int)PL_na;
+	{
+	    STRLEN len;
+	    DBM_ckFilter($arg, filter_store_key, \"filter_store_key\");
+	    $var.dptr = SvPVbyte($arg, len);
+	    $var.dsize = (int)len;
+	}
+T_DATUM_K_C
+	{
+	    SV * tmpSV ;
+	    STRLEN len;
+	    if (db->filter_store_key){
+	        tmpSV = sv_2mortal(newSVsv($arg));
+	        DBM_ckFilter(tmpSV, filter_store_key, \"filter_store_key\");
+	    }
+	    else
+		tmpSV = $arg;
+	    $var.dptr = SvPVbyte(tmpSV, len);
+	    $var.dsize = (int)len;
+	}
 T_DATUM_V
-        ckFilter($arg, filter_store_value, \"filter_store_value\");
+        DBM_ckFilter($arg, filter_store_value, \"filter_store_value\");
 	if (SvOK($arg)) {
-	    $var.dptr = SvPV($arg, PL_na);
-	    $var.dsize = (int)PL_na;
+	    STRLEN len;
+	    $var.dptr = SvPVbyte($arg, len);
+	    $var.dsize = (int)len;
 	}
 	else {
 	    $var.dptr = \"\";
@@ -33,9 +51,9 @@ T_GDATUM
 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);