diff options
| author | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2014-12-09 14:50:17 +0000 |
|---|---|---|
| committer | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2014-12-09 14:50:17 +0000 |
| commit | 503436852cd828a270769d86d8f9f50fab0380d1 (patch) | |
| tree | 7846f2d6ac044ecf866ae6bbce09635f4f223e05 | |
| parent | c4c855b90ec42b2452daf44d4d9994afd1613089 (diff) | |
| download | perl-503436852cd828a270769d86d8f9f50fab0380d1.tar.gz | |
Update DB_File to CPAN version 1.832
[DELTA]
1.832 8 Dec 2014
* Silence compiler warnings
* C++ change from blead
| -rwxr-xr-x | Porting/Maintainers.pl | 4 | ||||
| -rw-r--r-- | cpan/DB_File/DB_File.pm | 2 | ||||
| -rw-r--r-- | cpan/DB_File/DB_File.xs | 21 | ||||
| -rw-r--r-- | t/porting/customized.dat | 1 |
4 files changed, 23 insertions, 5 deletions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index e1ec45e092..905d6c3e0d 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -328,9 +328,7 @@ use File::Glob qw(:case); }, 'DB_File' => { - # https://rt.cpan.org/Ticket/Display.html?id=96126 - "CUSTOMIZED" => [ "DB_File.xs" ], - 'DISTRIBUTION' => 'PMQS/DB_File-1.831.tar.gz', + 'DISTRIBUTION' => 'PMQS/DB_File-1.832.tar.gz', 'FILES' => q[cpan/DB_File], 'EXCLUDED' => [ qr{^patches/}, diff --git a/cpan/DB_File/DB_File.pm b/cpan/DB_File/DB_File.pm index 9a34694501..73fd4e0cf5 100644 --- a/cpan/DB_File/DB_File.pm +++ b/cpan/DB_File/DB_File.pm @@ -163,7 +163,7 @@ our ($db_version, $use_XSLoader, $splice_end_array_no_length, $splice_end_array, use Carp; -$VERSION = "1.831" ; +$VERSION = "1.832" ; $VERSION = eval $VERSION; # needed for dev releases { diff --git a/cpan/DB_File/DB_File.xs b/cpan/DB_File/DB_File.xs index d9317c0ae5..d694695739 100644 --- a/cpan/DB_File/DB_File.xs +++ b/cpan/DB_File/DB_File.xs @@ -153,6 +153,10 @@ # include <db.h> #endif +#ifndef PERL_UNUSED_ARG +# define PERL_UNUSED_ARG(x) ((void)x) +#endif + /* Wall starts with 5.7.x */ #if PERL_REVISION > 5 || (PERL_REVISION == 5 && PERL_VERSION >= 7) @@ -599,6 +603,9 @@ const DBT * key2 ; int retval ; int count ; +#ifdef AT_LEAST_DB_3_2 + PERL_UNUSED_ARG(db); +#endif if (CurrentDB->in_compare) { tidyUp(CurrentDB); @@ -684,6 +691,10 @@ const DBT * key2 ; int retval ; int count ; +#ifdef AT_LEAST_DB_3_2 + PERL_UNUSED_ARG(db); +#endif + if (CurrentDB->in_prefix){ tidyUp(CurrentDB); croak ("DB_File btree_prefix: recursion detected\n") ; @@ -773,6 +784,10 @@ HASH_CB_SIZE_TYPE size ; int retval = 0; int count ; +#ifdef AT_LEAST_DB_3_2 + PERL_UNUSED_ARG(db); +#endif + if (CurrentDB->in_hash){ tidyUp(CurrentDB); croak ("DB_File hash callback: recursion detected\n") ; @@ -828,6 +843,9 @@ db_errcall_cb(const char * db_errpfx, char * buffer) dTHX; #endif SV * sv = perl_get_sv(ERR_BUFF, FALSE) ; +#ifdef AT_LEAST_DB_4_3 + PERL_UNUSED_ARG(dbenv); +#endif if (sv) { if (db_errpfx) sv_setpvf(sv, "%s: %s", db_errpfx, buffer) ; @@ -1528,6 +1546,7 @@ BOOT: #endif #ifdef WANT_ERROR SV * sv_err = perl_get_sv(ERR_BUFF, GV_ADD|GV_ADDMULTI) ; + PERL_UNUSED_VAR(sv_err); /* huh? we just retrieved it... */ #endif MY_CXT_INIT; __getBerkeleyDBInfo() ; @@ -1606,6 +1625,7 @@ db_DELETE(db, key, flags=0) PREINIT: dMY_CXT; INIT: + (void)flags; CurrentDB = db ; @@ -1654,6 +1674,7 @@ db_STORE(db, key, value, flags=0) PREINIT: dMY_CXT; INIT: + (void)flags; CurrentDB = db ; diff --git a/t/porting/customized.dat b/t/porting/customized.dat index 0085b03dfd..03883f121d 100644 --- a/t/porting/customized.dat +++ b/t/porting/customized.dat @@ -1,4 +1,3 @@ -DB_File cpan/DB_File/DB_File.xs f364b661bbb0df075b0c425b104577e7176fe82b Digest::MD5 cpan/Digest-MD5/t/files.t bdbe05b705d9da305fedce7a9f4b6ba63250c7cf Encode cpan/Encode/encoding.pm 506ec84f1fbbff189c3f4f47b92aff5afc95b98e PerlIO::via::QuotedPrint cpan/PerlIO-via-QuotedPrint/t/QuotedPrint.t ca39f0146e89de02c746e199c45dcb3e5edad691 |