ODBM_File can use the same T_PTROBJ typemap as the other ?DBM_File modules.

This simplifies the RETVAL handling in TIEHASH, and makes the code closer
to the other 3 ?DBM_File modules. The difference in TIEHASH handling dates
back to 5.000, where only ODBM_File needed helper code around the dbm_open()
call. The other 3 were able to #define it as dbm_TIEHASH, and hence had no
CODE: section when first written.

diff --git a/ext/ODBM_File/ODBM_File.pm b/ext/ODBM_File/ODBM_File.pm
index 5c8d10b..958232c 100644 (file)
--- a/ext/ODBM_File/ODBM_File.pm
+++ b/ext/ODBM_File/ODBM_File.pm
@@ -7,7 +7,7 @@ require Tie::Hash;
 require XSLoader;
 
 our @ISA = qw(Tie::Hash);
-our $VERSION = "1.11";
+our $VERSION = "1.12";
 
 XSLoader::load();
 

diff --git a/ext/ODBM_File/ODBM_File.xs b/ext/ODBM_File/ODBM_File.xs
index 15c1725..d1ece7f 100644 (file)
--- a/ext/ODBM_File/ODBM_File.xs
+++ b/ext/ODBM_File/ODBM_File.xs
@@ -113,9 +113,9 @@ odbm_TIEHASH(dbtype, filename, flags, mode)
            dbp = (void*)(dbminit(filename) >= 0 ? &dbmrefcnt : 0);
            RETVAL = (ODBM_File)safecalloc(1, sizeof(ODBM_File_type));
            RETVAL->dbp = dbp ;
-           ST(0) = sv_mortalcopy(&PL_sv_undef);
-           sv_setptrobj(ST(0), RETVAL, dbtype);
        }
+       OUTPUT:
+         RETVAL
 
 void
 DESTROY(db)

diff --git a/ext/ODBM_File/typemap b/ext/ODBM_File/typemap
index d1f16b4..2612dfd 100644 (file)
--- a/ext/ODBM_File/typemap
+++ b/ext/ODBM_File/typemap
@@ -57,3 +57,5 @@ T_DATUM_V
        DBM_ckFilter($arg, filter[fetch_value],\"filter_fetch_value\");
 T_GDATUM
        sv_usepvn($arg, $var.dptr, $var.dsize);
+T_PTROBJ
+        sv_setref_pv($arg, dbtype, (void*)$var);

diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 1b16783..e714e2f 100644 (file)
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -181,6 +181,13 @@ L<Module::Metadata> has been upgraded from version 1.000005_01 to version 1.0000
 
 =item *
 
+L<ODBM_File> has been upgraded from version 1.11 to version 1.12.
+
+This is only a minor refactoring of the XS code to bring it closer to the
+other C<?DBM_File> modules.
+
+=item *
+
 L<Pod::Simple> has been upgraded from version 3.18 to version 3.19.
 
 =item *