diff options
| author |   millert <millert@openbsd.org> | 2009-10-12 18:24:18 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2009-10-12 18:24:18 +0000 |
| commit | df042708019d82f10a844f81545b8510eb33a43b (patch) | |
| tree | f1aa8a2977492c1084da8a9a42ad99fe382fba66 /gnu/usr.bin/perl/ext/GDBM_File | |
| parent | to support virtual domains properly, smtpd needed to have the domain stored (diff) | |
| download | wireguard-openbsd-df042708019d82f10a844f81545b8510eb33a43b.tar.xz wireguard-openbsd-df042708019d82f10a844f81545b8510eb33a43b.zip | |
Merge in perl 5.10.1
Diffstat (limited to 'gnu/usr.bin/perl/ext/GDBM_File')
| -rw-r--r-- | gnu/usr.bin/perl/ext/GDBM_File/GDBM_File.pm | 3 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/ext/GDBM_File/t/gdbm.t | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/perl/ext/GDBM_File/typemap | 20 |
3 files changed, 17 insertions, 10 deletions
diff --git a/gnu/usr.bin/perl/ext/GDBM_File/GDBM_File.pm b/gnu/usr.bin/perl/ext/GDBM_File/GDBM_File.pm index 641bb01ec96..2c9081fa9e2 100644 --- a/gnu/usr.bin/perl/ext/GDBM_File/GDBM_File.pm +++ b/gnu/usr.bin/perl/ext/GDBM_File/GDBM_File.pm @@ -68,7 +68,8 @@ use XSLoader (); GDBM_WRITER ); -$VERSION = "1.08"; +# This module isn't dual life, so no need for dev version numbers. +$VERSION = '1.09'; sub AUTOLOAD { my($constname); diff --git a/gnu/usr.bin/perl/ext/GDBM_File/t/gdbm.t b/gnu/usr.bin/perl/ext/GDBM_File/t/gdbm.t index 87e30d086b6..53a2ae5d9d0 100644 --- a/gnu/usr.bin/perl/ext/GDBM_File/t/gdbm.t +++ b/gnu/usr.bin/perl/ext/GDBM_File/t/gdbm.t @@ -487,7 +487,7 @@ EOM $h{"fred"} = "joe" ; ok(76, $h{"fred"} eq "joe"); - eval { grep { $h{$_} } (1, 2, 3) }; + eval { my @r= grep { $h{$_} } (1, 2, 3) }; ok (77, ! $@); @@ -503,7 +503,7 @@ EOM ok(79, $db->FIRSTKEY() eq "fred") ; - eval { grep { $h{$_} } (1, 2, 3) }; + eval { my @r= grep { $h{$_} } (1, 2, 3) }; ok (80, ! $@); undef $db ; diff --git a/gnu/usr.bin/perl/ext/GDBM_File/typemap b/gnu/usr.bin/perl/ext/GDBM_File/typemap index 8c7cb45b462..71fc285787d 100644 --- a/gnu/usr.bin/perl/ext/GDBM_File/typemap +++ b/gnu/usr.bin/perl/ext/GDBM_File/typemap @@ -16,28 +16,34 @@ FATALFUNC T_OPAQUEPTR INPUT T_DATUM_K DBM_ckFilter($arg, filter_store_key, \"filter_store_key\"); - $var.dptr = SvPVbyte($arg, PL_na); - $var.dsize = (int)PL_na; + { + STRLEN len; + $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, PL_na); - $var.dsize = (int)PL_na; + $var.dptr = SvPVbyte(tmpSV, len); + $var.dsize = (int)len; } T_DATUM_V DBM_ckFilter($arg, filter_store_value, \"filter_store_value\"); if (SvOK($arg)) { - $var.dptr = SvPVbyte($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 *)\"\"; + /* better would be for .dptr to be const char * */ $var.dsize = 0; } OUTPUT |