Fixed DBD::File finish() method to return 1 thanks to Jan Dubois.

Fixed dbivport.h warnings on some compilers. Fixed DBI::PurePerl warning from beta release versions of Math::BigInt git-svn-id: https://svn.perl.org/modules/dbi/trunk@442 50811bd7-b8ce-0310-adc1-d9db26280581
ilmari · Aug 26, 2004 · add8e05 · add8e05
1 parent 03eb634
commit add8e05
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/Changes b/Changes
@@ -6,7 +6,10 @@ DBI::Changes - List of significant changes to the DBI
 
 =head2 Changes in DBI 1.44 (svn rev ???),    XXX
 
+fix utf8 leakage
+
   Fixed build issues on VMS thanks to Jakob Snoer.
+  Fixed DBD::File finish() method to return 1 thanks to Jan Dubois.
 
   Changed bind_param_array() so it doesn't require all bind arrays
     to have the same number of elements.

diff --git a/dbivport.h b/dbivport.h
@@ -18,7 +18,7 @@
 */
 #define DBIh_SET_ERR_CHAR(h, imp_xxh, err_c, err_i, errstr, state, method) \
         sv_setiv(DBIc_ERR(imp_xxh), err_i); \
-        (state) ? sv_setpv(DBIc_STATE(imp_xxh), state) : SvOK_off(DBIc_STATE(imp_xxh)); \
+        (state) ? (void)sv_setpv(DBIc_STATE(imp_xxh), state) : (void)SvOK_off(DBIc_STATE(imp_xxh)); \
         sv_setpv(DBIc_ERRSTR(imp_xxh), errstr)
 #endif
 

diff --git a/lib/DBD/File.pm b/lib/DBD/File.pm
@@ -441,6 +441,7 @@ sub finish {
     my $sth = shift;
     $sth->{Active}=0;
     delete $sth->{f_stmt}->{data};
+    return 1;
 }
 sub fetch ($) {
     my $sth = shift;

diff --git a/lib/DBI/DBD.pm b/lib/DBI/DBD.pm
@@ -3684,14 +3684,14 @@ sub dbd_edit_mm_attribs {
 	# so 'make' creates them and 'make clean' deletes them
 	my %test_variants = (
 	    pp => {	name => "DBI::PurePerl",
-			add => [ '$ENV{DBI_PUREPERL}=2;' ],
+			add => [ 'local $ENV{DBI_PUREPERL} = 2;' ],
 	    },
 	    mx => {	name => "DBD::Multiplex",
-			add => [ q{$ENV{DBI_AUTOPROXY}='dbi:Multiplex:';} ],
+			add => [ q{local $ENV{DBI_AUTOPROXY} = 'dbi:Multiplex:';} ],
 	    }
 	#   px => {	name => "DBD::Proxy",
 	#		need mechanism for starting/stopping the proxy server
-	#		add => [ q{$ENV{DBI_AUTOPROXY}='dbi:Proxy:XXX';} ],
+	#		add => [ q{local $ENV{DBI_AUTOPROXY} = 'dbi:Proxy:XXX';} ],
 	#   }
 	);
 	# currently many tests fail - DBD::Multiplex needs more work

diff --git a/lib/DBI/PurePerl.pm b/lib/DBI/PurePerl.pm
@@ -521,7 +521,7 @@ sub hash {
     elsif ($type == 1) {	# Fowler/Noll/Vo hash
         # see http://www.isthe.com/chongo/tech/comp/fnv/
         require Math::BigInt;   # feel free to reimplement w/o BigInt!
-	my $version = $Math::BigInt::VERSION || 0;
+	(my $version = $Math::BigInt::VERSION || 0) =~ s/_.*//; # eg "1.70_01"
 	if ($version >= 1.56) {
 	    $hash = Math::BigInt->new(0x811c9dc5);
 	    for my $uchar (unpack ("C*", $key)) {