X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FNDBM_File%2Ftypemap;h=ad62e0aaf25d8fb2e9445682c715dae0cd31c856;hb=280cf07eab629d0d4801176eedac7fefa4afecc7;hp=40b95f22c022a980eb7681ff98ba13dbafcb48b1;hpb=cbc5248d01a71061a57c964b98f44bd4cb3a75c0;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/NDBM_File/typemap b/ext/NDBM_File/typemap
index 40b95f2..ad62e0a 100644
--- a/ext/NDBM_File/typemap
+++ b/ext/NDBM_File/typemap
@@ -15,28 +15,32 @@ 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_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 = \"\";
+	    $var.dptr = (char *)\"\";
 	    $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\");
+	sv_setpvn($arg, (char *)$var.dptr, $var.dsize);
+	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\");
+	sv_setpvn($arg, (char *)$var.dptr, $var.dsize);
+	DBM_ckFilter($arg, filter_fetch_value, \"filter_fetch_value\");
 T_GDATUM
 	sv_usepvn($arg, $var.dptr, $var.dsize);
 T_PTROBJ