X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=ext%2FGDBM_File%2Ftypemap;h=8c7cb45b462353afb00564f93116972f9aed79eb;hb=01b509b0993b5dd659665407a96cb80ea8da0cab;hp=8952938ccd97dae5ccc3ada480d640bb324b9612;hpb=0bf2e7072c2c1360a32d348a7c800f40c1108f8a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/ext/GDBM_File/typemap b/ext/GDBM_File/typemap
index 8952938..8c7cb45 100644
--- a/ext/GDBM_File/typemap
+++ b/ext/GDBM_File/typemap
@@ -3,7 +3,7 @@
 #
 
 datum_key		T_DATUM_K
-datum_key_copy		T_DATUM_K_C
+datum_key_copy		T_DATUM_K
 datum_value		T_DATUM_V
 NDBM_File		T_PTROBJ
 GDBM_File		T_PTROBJ
@@ -15,25 +15,25 @@ FATALFUNC		T_OPAQUEPTR
 
 INPUT
 T_DATUM_K
-	ckFilter($arg, filter_store_key, \"filter_store_key\");
-	$var.dptr = SvPV($arg, PL_na);
+	DBM_ckFilter($arg, filter_store_key, \"filter_store_key\");
+	$var.dptr = SvPVbyte($arg, PL_na);
 	$var.dsize = (int)PL_na;
 T_DATUM_K_C
 	{
 	    SV * tmpSV;
 	    if (db->filter_store_key) {
 	        tmpSV = sv_2mortal(newSVsv($arg)); 
-	        ckFilter(tmpSV, filter_store_key, \"filter_store_key\");
+	        DBM_ckFilter(tmpSV, filter_store_key, \"filter_store_key\");
             }
             else
                 tmpSV = $arg;
-	    $var.dptr = SvPV(tmpSV, PL_na);
+	    $var.dptr = SvPVbyte(tmpSV, PL_na);
 	    $var.dsize = (int)PL_na;
 	}
 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.dptr = SvPVbyte($arg, PL_na);
 	    $var.dsize = (int)PL_na;
 	}
 	else {
@@ -43,9 +43,9 @@ T_DATUM_V
 OUTPUT
 T_DATUM_K
 	output_datum(aTHX_ $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
 	output_datum(aTHX_ $arg, $var.dptr, $var.dsize);
-	ckFilter($arg, filter_fetch_value,\"filter_fetch_value\");
+	DBM_ckFilter($arg, filter_fetch_value,\"filter_fetch_value\");
 T_PTROBJ
         sv_setref_pv($arg, dbtype, (void*)$var);