In perl.git, the branch blead has been updated
<https://perl5.git.perl.org/perl.git/commitdiff/1e3f5c479dff805236e9739c454a4d7fb9893db9?hp=1acbee7b20a7940bc8cedfb1e7b102d3028335e3>
- Log -----------------------------------------------------------------
commit 1e3f5c479dff805236e9739c454a4d7fb9893db9
Author: Chris 'BinGOs' Williams <ch...@bingosnet.co.uk>
Date: Mon Jun 3 18:57:27 2019 +0100
Update DB_File to CPAN version 1.852
[DELTA]
1.852 21 April Feb 2019
* ParseOpenInfo() leaks if it croaks
DB_File_type memory not freed when ParseOpenInfo croaks.
https://github.com/pmqs/DB_File/issues/1
* Fix whitespace in DB_File.xs
1.851 4 April Feb 2019
* Fix typo in MANIFEST with .travis.yml file
1.850 10 Feb 2019
* Added soure to github
https://github.com/pmqs/DB_File
* Added .travis.yml
* Added t/meta-json.t & t/meta-yaml.t
-----------------------------------------------------------------------
Summary of changes:
Porting/Maintainers.pl | 3 +-
cpan/DB_File/DB_File.pm | 4 +-
cpan/DB_File/DB_File.xs | 1847 +++++++++++++++++++++++-----------------------
cpan/DB_File/Makefile.PL | 32 +-
4 files changed, 958 insertions(+), 928 deletions(-)
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 313246d56d..a087d05404 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -332,10 +332,11 @@ use File::Glob qw(:case);
},
'DB_File' => {
- 'DISTRIBUTION' => 'PMQS/DB_File-1.843.tar.gz',
+ 'DISTRIBUTION' => 'PMQS/DB_File-1.852.tar.gz',
'FILES' => q[cpan/DB_File],
'EXCLUDED' => [
qr{^patches/},
+ qr{^t/meta},
qw( t/pod.t
fallback.h
fallback.xs
diff --git a/cpan/DB_File/DB_File.pm b/cpan/DB_File/DB_File.pm
index 6ca1592aad..97fcc4a855 100644
--- a/cpan/DB_File/DB_File.pm
+++ b/cpan/DB_File/DB_File.pm
@@ -2,7 +2,7 @@
#
# Written by Paul Marquess (p...@cpan.org)
#
-# Copyright (c) 1995-2018 Paul Marquess. All rights reserved.
+# Copyright (c) 1995-2019 Paul Marquess. All rights reserved.
# This program is free software; you can redistribute it and/or
# modify it under the same terms as Perl itself.
@@ -165,7 +165,7 @@ use Carp;
# Module not thread safe, so don't clone
sub CLONE_SKIP { 1 }
-$VERSION = "1.843" ;
+$VERSION = "1.852" ;
$VERSION = eval $VERSION; # needed for dev releases
{
diff --git a/cpan/DB_File/DB_File.xs b/cpan/DB_File/DB_File.xs
index 6e6e154ffd..b6db8d6e55 100644
--- a/cpan/DB_File/DB_File.xs
+++ b/cpan/DB_File/DB_File.xs
@@ -1,123 +1,123 @@
-/*
+/*
- DB_File.xs -- Perl 5 interface to Berkeley DB
+ DB_File.xs -- Perl 5 interface to Berkeley DB
Written by Paul Marquess <p...@cpan.org>
All comments/suggestions/problems are welcome
- Copyright (c) 1995-2018 Paul Marquess. All rights reserved.
+ Copyright (c) 1995-2019 Paul Marquess. All rights reserved.
This program is free software; you can redistribute it and/or
modify it under the same terms as Perl itself.
Changes:
- 0.1 - Initial Release
- 0.2 - No longer bombs out if dbopen returns an error.
- 0.3 - Added some support for multiple btree compares
- 1.0 - Complete support for multiple callbacks added.
- Fixed a problem with pushing a value onto an empty list.
- 1.01 - Fixed a SunOS core dump problem.
- The return value from TIEHASH wasn't set to NULL when
- dbopen returned an error.
- 1.02 - Use ALIAS to define TIEARRAY.
- Removed some redundant commented code.
- Merged OS2 code into the main distribution.
- Allow negative subscripts with RECNO interface.
- Changed the default flags to O_CREAT|O_RDWR
- 1.03 - Added EXISTS
- 1.04 - fixed a couple of bugs in hash_cb. Patches supplied by
- Dave Hammen, ham...@gothamcity.jsc.nasa.gov
- 1.05 - Added logic to allow prefix & hash types to be specified via
- Makefile.PL
- 1.06 - Minor namespace cleanup: Localized PrintBtree.
- 1.07 - Fixed bug with RECNO, where bval wasn't defaulting to "\n".
- 1.08 - No change to DB_File.xs
- 1.09 - Default mode for dbopen changed to 0666
- 1.10 - Fixed fd method so that it still returns -1 for
- in-memory files when db 1.86 is used.
- 1.11 - No change to DB_File.xs
- 1.12 - No change to DB_File.xs
- 1.13 - Tidied up a few casts.
- 1.14 - Made it illegal to tie an associative array to a RECNO
- database and an ordinary array to a HASH or BTREE database.
- 1.50 - Make work with both DB 1.x or DB 2.x
- 1.51 - Fixed a bug in mapping 1.x O_RDONLY flag to 2.x DB_RDONLY
equivalent
- 1.52 - Patch from Gisle Aas <gi...@aas.no> to suppress "use of
- undefined value" warning with db_get and db_seq.
- 1.53 - Added DB_RENUMBER to flags for recno.
- 1.54 - Fixed bug in the fd method
- 1.55 - Fix for AIX from Jarkko Hietaniemi
- 1.56 - No change to DB_File.xs
- 1.57 - added the #undef op to allow building with Threads support.
- 1.58 - Fixed a problem with the use of sv_setpvn. When the
- size is specified as 0, it does a strlen on the data.
- This was ok for DB 1.x, but isn't for DB 2.x.
- 1.59 - No change to DB_File.xs
- 1.60 - Some code tidy up
- 1.61 - added flagSet macro for DB 2.5.x
- fixed typo in O_RDONLY test.
- 1.62 - No change to DB_File.xs
- 1.63 - Fix to alllow DB 2.6.x to build.
- 1.64 - Tidied up the 1.x to 2.x flags mapping code.
- Added a patch from Mark Kettenis <kette...@wins.uva.nl>
- to fix a flag mapping problem with O_RDONLY on the Hurd
- 1.65 - Fixed a bug in the PUSH logic.
- Added BOOT check that using 2.3.4 or greater
- 1.66 - Added DBM filter code
- 1.67 - Backed off the use of newSVpvn.
- Fixed DBM Filter code for Perl 5.004.
- Fixed a small memory leak in the filter code.
- 1.68 - fixed backward compatibility bug with R_IAFTER & R_IBEFORE
- merged in the 5.005_58 changes
- 1.69 - fixed a bug in push -- DB_APPEND wasn't working properly.
- Fixed the R_SETCURSOR bug introduced in 1.68
- Added a new Perl variable $DB_File::db_ver
- 1.70 - Initialise $DB_File::db_ver and $DB_File::db_version with
- GV_ADD|GV_ADDMULT -- bug spotted by Nick Ing-Simmons.
- Added a BOOT check to test for equivalent versions of db.h &
- libdb.a/so.
- 1.71 - Support for Berkeley DB version 3.
- Support for Berkeley DB 2/3's backward compatibility mode.
- Rewrote push
- 1.72 - No change to DB_File.xs
- 1.73 - No change to DB_File.xs
- 1.74 - A call to open needed parenthesised to stop it clashing
- with a win32 macro.
- Added Perl core patches 7703 & 7801.
- 1.75 - Fixed Perl core patch 7703.
- Added support to allow DB_File to be built with
- Berkeley DB 3.2 -- btree_compare, btree_prefix and hash_cb
- needed to be changed.
- 1.76 - No change to DB_File.xs
- 1.77 - Tidied up a few types used in calling newSVpvn.
- 1.78 - Core patch 10335, 10372, 10534, 10549, 11051 included.
- 1.79 - NEXTKEY ignores the input key.
- Added lots of casts
- 1.800 - Moved backward compatibility code into ppport.h.
- Use the new constants code.
- 1.801 - No change to DB_File.xs
- 1.802 - No change to DB_File.xs
- 1.803 - FETCH, STORE & DELETE don't map the flags parameter
- into the equivalent Berkeley DB function anymore.
- 1.804 - no change.
- 1.805 - recursion detection added to the callbacks
- Support for 4.1.X added.
- Filter code can now cope with read-only $_
- 1.806 - recursion detection beefed up.
- 1.807 - no change
- 1.808 - leak fixed in ParseOpenInfo
- 1.809 - no change
- 1.810 - no change
- 1.811 - no change
- 1.812 - no change
- 1.813 - no change
- 1.814 - no change
- 1.814 - C++ casting fixes
+ 0.1 - Initial Release
+ 0.2 - No longer bombs out if dbopen returns an error.
+ 0.3 - Added some support for multiple btree compares
+ 1.0 - Complete support for multiple callbacks added.
+ Fixed a problem with pushing a value onto an empty list.
+ 1.01 - Fixed a SunOS core dump problem.
+ The return value from TIEHASH wasn't set to NULL when
+ dbopen returned an error.
+ 1.02 - Use ALIAS to define TIEARRAY.
+ Removed some redundant commented code.
+ Merged OS2 code into the main distribution.
+ Allow negative subscripts with RECNO interface.
+ Changed the default flags to O_CREAT|O_RDWR
+ 1.03 - Added EXISTS
+ 1.04 - fixed a couple of bugs in hash_cb. Patches supplied by
+ Dave Hammen, ham...@gothamcity.jsc.nasa.gov
+ 1.05 - Added logic to allow prefix & hash types to be specified via
+ Makefile.PL
+ 1.06 - Minor namespace cleanup: Localized PrintBtree.
+ 1.07 - Fixed bug with RECNO, where bval wasn't defaulting to "\n".
+ 1.08 - No change to DB_File.xs
+ 1.09 - Default mode for dbopen changed to 0666
+ 1.10 - Fixed fd method so that it still returns -1 for
+ in-memory files when db 1.86 is used.
+ 1.11 - No change to DB_File.xs
+ 1.12 - No change to DB_File.xs
+ 1.13 - Tidied up a few casts.
+ 1.14 - Made it illegal to tie an associative array to a RECNO
+ database and an ordinary array to a HASH or BTREE database.
+ 1.50 - Make work with both DB 1.x or DB 2.x
+ 1.51 - Fixed a bug in mapping 1.x O_RDONLY flag to 2.x DB_RDONLY
equivalent
+ 1.52 - Patch from Gisle Aas <gi...@aas.no> to suppress "use of
+ undefined value" warning with db_get and db_seq.
+ 1.53 - Added DB_RENUMBER to flags for recno.
+ 1.54 - Fixed bug in the fd method
+ 1.55 - Fix for AIX from Jarkko Hietaniemi
+ 1.56 - No change to DB_File.xs
+ 1.57 - added the #undef op to allow building with Threads support.
+ 1.58 - Fixed a problem with the use of sv_setpvn. When the
+ size is specified as 0, it does a strlen on the data.
+ This was ok for DB 1.x, but isn't for DB 2.x.
+ 1.59 - No change to DB_File.xs
+ 1.60 - Some code tidy up
+ 1.61 - added flagSet macro for DB 2.5.x
+ fixed typo in O_RDONLY test.
+ 1.62 - No change to DB_File.xs
+ 1.63 - Fix to alllow DB 2.6.x to build.
+ 1.64 - Tidied up the 1.x to 2.x flags mapping code.
+ Added a patch from Mark Kettenis <kette...@wins.uva.nl>
+ to fix a flag mapping problem with O_RDONLY on the Hurd
+ 1.65 - Fixed a bug in the PUSH logic.
+ Added BOOT check that using 2.3.4 or greater
+ 1.66 - Added DBM filter code
+ 1.67 - Backed off the use of newSVpvn.
+ Fixed DBM Filter code for Perl 5.004.
+ Fixed a small memory leak in the filter code.
+ 1.68 - fixed backward compatibility bug with R_IAFTER & R_IBEFORE
+ merged in the 5.005_58 changes
+ 1.69 - fixed a bug in push -- DB_APPEND wasn't working properly.
+ Fixed the R_SETCURSOR bug introduced in 1.68
+ Added a new Perl variable $DB_File::db_ver
+ 1.70 - Initialise $DB_File::db_ver and $DB_File::db_version with
+ GV_ADD|GV_ADDMULT -- bug spotted by Nick Ing-Simmons.
+ Added a BOOT check to test for equivalent versions of db.h &
+ libdb.a/so.
+ 1.71 - Support for Berkeley DB version 3.
+ Support for Berkeley DB 2/3's backward compatibility mode.
+ Rewrote push
+ 1.72 - No change to DB_File.xs
+ 1.73 - No change to DB_File.xs
+ 1.74 - A call to open needed parenthesised to stop it clashing
+ with a win32 macro.
+ Added Perl core patches 7703 & 7801.
+ 1.75 - Fixed Perl core patch 7703.
+ Added support to allow DB_File to be built with
+ Berkeley DB 3.2 -- btree_compare, btree_prefix and hash_cb
+ needed to be changed.
+ 1.76 - No change to DB_File.xs
+ 1.77 - Tidied up a few types used in calling newSVpvn.
+ 1.78 - Core patch 10335, 10372, 10534, 10549, 11051 included.
+ 1.79 - NEXTKEY ignores the input key.
+ Added lots of casts
+ 1.800 - Moved backward compatibility code into ppport.h.
+ Use the new constants code.
+ 1.801 - No change to DB_File.xs
+ 1.802 - No change to DB_File.xs
+ 1.803 - FETCH, STORE & DELETE don't map the flags parameter
+ into the equivalent Berkeley DB function anymore.
+ 1.804 - no change.
+ 1.805 - recursion detection added to the callbacks
+ Support for 4.1.X added.
+ Filter code can now cope with read-only $_
+ 1.806 - recursion detection beefed up.
+ 1.807 - no change
+ 1.808 - leak fixed in ParseOpenInfo
+ 1.809 - no change
+ 1.810 - no change
+ 1.811 - no change
+ 1.812 - no change
+ 1.813 - no change
+ 1.814 - no change
+ 1.814 - C++ casting fixes
*/
#define PERL_NO_GET_CONTEXT
-#include "EXTERN.h"
+#include "EXTERN.h"
#include "perl.h"
#include "XSUB.h"
@@ -178,10 +178,10 @@ int DB_File___unused() { return 0; }
/* Ditto for dXSARGS. */
# undef dXSARGS
-# define dXSARGS \
- dSP; dMARK; \
- I32 ax = mark - PL_stack_base + 1; \
- I32 items = sp - mark
+# define dXSARGS \
+ dSP; dMARK; \
+ I32 ax = mark - PL_stack_base + 1; \
+ I32 items = sp - mark
# endif
@@ -191,7 +191,7 @@ int DB_File___unused() { return 0; }
#endif /* Perl >= 5.7 */
-#include <fcntl.h>
+#include <fcntl.h>
/* #define TRACE */
@@ -202,7 +202,7 @@ int DB_File___unused() { return 0; }
#endif
-#define DBT_clear(x) Zero(&x, 1, DBT) ;
+#define DBT_clear(x) Zero(&x, 1, DBT) ;
#ifdef DB_VERSION_MAJOR
@@ -226,7 +226,7 @@ int DB_File___unused() { return 0; }
# define AT_LEAST_DB_4_3
#endif
-#if DB_VERSION_MAJOR >= 6
+#if DB_VERSION_MAJOR >= 6
# define AT_LEAST_DB_6_0
#endif
@@ -239,23 +239,23 @@ int DB_File___unused() { return 0; }
#ifdef DB_Prefix_t
# undef DB_Prefix_t
#endif
-#define DB_Prefix_t size_t
+#define DB_Prefix_t size_t
#ifdef DB_Hash_t
# undef DB_Hash_t
#endif
-#define DB_Hash_t u_int32_t
+#define DB_Hash_t u_int32_t
/* DBTYPE stays the same */
/* HASHINFO, RECNOINFO and BTREEINFO map to DB_INFO */
#if DB_VERSION_MAJOR == 2
- typedef DB_INFO INFO ;
+ typedef DB_INFO INFO ;
#else /* DB_VERSION_MAJOR > 2 */
-# define DB_FIXEDLEN (0x8000)
+# define DB_FIXEDLEN (0x8000)
#endif /* DB_VERSION_MAJOR == 2 */
-/* version 2 has db_recno_t in place of recno_t */
-typedef db_recno_t recno_t;
+/* version 2 has db_recno_t in place of recno_t */
+typedef db_recno_t recno_t;
#define R_CURSOR DB_SET_RANGE
@@ -268,53 +268,53 @@ typedef db_recno_t recno_t;
#define R_PREV DB_PREV
#if DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR < 5
-# define R_SETCURSOR 0x800000
+# define R_SETCURSOR 0x800000
#else
-# define R_SETCURSOR (DB_OPFLAGS_MASK)
+# define R_SETCURSOR (DB_OPFLAGS_MASK)
#endif
#define R_RECNOSYNC 0
-#define R_FIXEDLEN DB_FIXEDLEN
-#define R_DUP DB_DUP
-
-
-#define db_HA_hash h_hash
-#define db_HA_ffactor h_ffactor
-#define db_HA_nelem h_nelem
-#define db_HA_bsize db_pagesize
-#define db_HA_cachesize db_cachesize
-#define db_HA_lorder db_lorder
-
-#define db_BT_compare bt_compare
-#define db_BT_prefix bt_prefix
-#define db_BT_flags flags
-#define db_BT_psize db_pagesize
-#define db_BT_cachesize db_cachesize
-#define db_BT_lorder db_lorder
+#define R_FIXEDLEN DB_FIXEDLEN
+#define R_DUP DB_DUP
+
+
+#define db_HA_hash h_hash
+#define db_HA_ffactor h_ffactor
+#define db_HA_nelem h_nelem
+#define db_HA_bsize db_pagesize
+#define db_HA_cachesize db_cachesize
+#define db_HA_lorder db_lorder
+
+#define db_BT_compare bt_compare
+#define db_BT_prefix bt_prefix
+#define db_BT_flags flags
+#define db_BT_psize db_pagesize
+#define db_BT_cachesize db_cachesize
+#define db_BT_lorder db_lorder
#define db_BT_maxkeypage
#define db_BT_minkeypage
-#define db_RE_reclen re_len
-#define db_RE_flags flags
-#define db_RE_bval re_pad
-#define db_RE_bfname re_source
-#define db_RE_psize db_pagesize
-#define db_RE_cachesize db_cachesize
-#define db_RE_lorder db_lorder
+#define db_RE_reclen re_len
+#define db_RE_flags flags
+#define db_RE_bval re_pad
+#define db_RE_bfname re_source
+#define db_RE_psize db_pagesize
+#define db_RE_cachesize db_cachesize
+#define db_RE_lorder db_lorder
-#define TXN NULL,
+#define TXN NULL,
-#define do_SEQ(db, key, value, flag) (db->cursor->c_get)(db->cursor, &key,
&value, flag)
+#define do_SEQ(db, key, value, flag) (db->cursor->c_get)(db->cursor, &key,
&value, flag)
-#define DBT_flags(x) x.flags = 0
-#define DB_flags(x, v) x |= v
+#define DBT_flags(x) x.flags = 0
+#define DB_flags(x, v) x |= v
#if DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR < 5
-# define flagSet(flags, bitmask) ((flags) & (bitmask))
+# define flagSet(flags, bitmask) ((flags) & (bitmask))
#else
-# define flagSet(flags, bitmask) (((flags) & DB_OPFLAGS_MASK) ==
(u_int)(bitmask))
+# define flagSet(flags, bitmask) (((flags) & DB_OPFLAGS_MASK) ==
(u_int)(bitmask))
#endif
#else /* db version 1.x */
@@ -323,55 +323,55 @@ typedef db_recno_t recno_t;
#define BERKELEY_DB_1_OR_2
typedef union INFO {
- HASHINFO hash ;
- RECNOINFO recno ;
- BTREEINFO btree ;
+ HASHINFO hash ;
+ RECNOINFO recno ;
+ BTREEINFO btree ;
} INFO ;
-#ifdef mDB_Prefix_t
+#ifdef mDB_Prefix_t
# ifdef DB_Prefix_t
# undef DB_Prefix_t
# endif
-# define DB_Prefix_t mDB_Prefix_t
+# define DB_Prefix_t mDB_Prefix_t
#endif
#ifdef mDB_Hash_t
# ifdef DB_Hash_t
# undef DB_Hash_t
# endif
-# define DB_Hash_t mDB_Hash_t
-#endif
-
-#define db_HA_hash hash.hash
-#define db_HA_ffactor hash.ffactor
-#define db_HA_nelem hash.nelem
-#define db_HA_bsize hash.bsize
-#define db_HA_cachesize hash.cachesize
-#define db_HA_lorder hash.lorder
-
-#define db_BT_compare btree.compare
-#define db_BT_prefix btree.prefix
-#define db_BT_flags btree.flags
-#define db_BT_psize btree.psize
-#define db_BT_cachesize btree.cachesize
-#define db_BT_lorder btree.lorder
+# define DB_Hash_t mDB_Hash_t
+#endif
+
+#define db_HA_hash hash.hash
+#define db_HA_ffactor hash.ffactor
+#define db_HA_nelem hash.nelem
+#define db_HA_bsize hash.bsize
+#define db_HA_cachesize hash.cachesize
+#define db_HA_lorder hash.lorder
+
+#define db_BT_compare btree.compare
+#define db_BT_prefix btree.prefix
+#define db_BT_flags btree.flags
+#define db_BT_psize btree.psize
+#define db_BT_cachesize btree.cachesize
+#define db_BT_lorder btree.lorder
#define db_BT_maxkeypage btree.maxkeypage
#define db_BT_minkeypage btree.minkeypage
-#define db_RE_reclen recno.reclen
-#define db_RE_flags recno.flags
-#define db_RE_bval recno.bval
-#define db_RE_bfname recno.bfname
-#define db_RE_psize recno.psize
-#define db_RE_cachesize recno.cachesize
-#define db_RE_lorder recno.lorder
+#define db_RE_reclen recno.reclen
+#define db_RE_flags recno.flags
+#define db_RE_bval recno.bval
+#define db_RE_bfname recno.bfname
+#define db_RE_psize recno.psize
+#define db_RE_cachesize recno.cachesize
+#define db_RE_lorder recno.lorder
-#define TXN
+#define TXN
-#define do_SEQ(db, key, value, flag) (db->dbp->seq)(db->dbp, &key, &value,
flag)
-#define DBT_flags(x)
-#define DB_flags(x, v)
+#define do_SEQ(db, key, value, flag) (db->dbp->seq)(db->dbp, &key, &value,
flag)
+#define DBT_flags(x)
+#define DB_flags(x, v)
#define flagSet(flags, bitmask) ((flags) & (bitmask))
#endif /* db version 1 */
@@ -387,16 +387,16 @@ typedef union INFO {
#ifdef DB_VERSION_MAJOR
#define db_DESTROY(db) (!db->aborted && (
db->cursor->c_close(db->cursor),\
- (db->dbp->close)(db->dbp, 0) ))
-#define db_close(db) ((db->dbp)->close)(db->dbp, 0)
-#define db_del(db, key, flags) (flagSet(flags, R_CURSOR)
\
- ?
((db->cursor)->c_del)(db->cursor, 0) \
- : ((db->dbp)->del)(db->dbp,
NULL, &key, flags) )
+ (db->dbp->close)(db->dbp, 0) ))
+#define db_close(db) ((db->dbp)->close)(db->dbp, 0)
+#define db_del(db, key, flags) (flagSet(flags, R_CURSOR)
\
+ ? ((db->cursor)->c_del)(db->cursor, 0) \
+ : ((db->dbp)->del)(db->dbp, NULL, &key, flags) )
#else /* ! DB_VERSION_MAJOR */
#define db_DESTROY(db) (!db->aborted &&
((db->dbp)->close)(db->dbp))
-#define db_close(db) ((db->dbp)->close)(db->dbp)
+#define db_close(db) ((db->dbp)->close)(db->dbp)
#define db_del(db, key, flags) ((db->dbp)->del)(db->dbp, &key, flags)
#define db_put(db, key, value, flags) ((db->dbp)->put)(db->dbp, &key,
&value, flags)
@@ -406,61 +406,69 @@ typedef union INFO {
#define db_seq(db, key, value, flags) do_SEQ(db, key, value, flags)
typedef struct {
- DBTYPE type ;
- DB * dbp ;
- SV * compare ;
- bool in_compare ;
- SV * prefix ;
- bool in_prefix ;
- SV * hash ;
- bool in_hash ;
- bool aborted ;
- int in_memory ;
+ DBTYPE type ;
+ DB * dbp ;
+ SV * compare ;
+ bool in_compare ;
+ SV * prefix ;
+ bool in_prefix ;
+ SV * hash ;
+ bool in_hash ;
+ bool aborted ;
+ int in_memory ;
#ifdef BERKELEY_DB_1_OR_2
- INFO info ;
-#endif
+ INFO info ;
+#endif
#ifdef DB_VERSION_MAJOR
- DBC * cursor ;
+ DBC * cursor ;
#endif
- SV * filter_fetch_key ;
- SV * filter_store_key ;
- SV * filter_fetch_value ;
- SV * filter_store_value ;
- int filtering ;
+ SV * filter_fetch_key ;
+ SV * filter_store_key ;
+ SV * filter_fetch_value ;
+ SV * filter_store_value ;
+ int filtering ;
- } DB_File_type;
+ } DB_File_type;
typedef DB_File_type * DB_File ;
typedef DBT DBTKEY ;
#define my_sv_setpvn(sv, d, s) sv_setpvn(sv, (s ? d : (const char *)""), s)
-#define OutputValue(arg, name) \
- { if (RETVAL == 0) { \
- SvGETMAGIC(arg) ; \
- my_sv_setpvn(arg, (const char *)name.data, name.size) ;
\
- TAINT; \
- SvTAINTED_on(arg); \
- SvUTF8_off(arg); \
- DBM_ckFilter(arg, filter_fetch_value,"filter_fetch_value") ;
\
- } \
- }
-
-#define OutputKey(arg, name) \
- { if (RETVAL == 0) \
- { \
- SvGETMAGIC(arg) ; \
- if (db->type != DB_RECNO) { \
- my_sv_setpvn(arg, (const char *)name.data, name.size);
\
- } \
- else \
- sv_setiv(arg, (I32)*(I32*)name.data - 1); \
- TAINT; \
- SvTAINTED_on(arg); \
- SvUTF8_off(arg); \
- DBM_ckFilter(arg, filter_fetch_key,"filter_fetch_key") ; \
- } \
- }
+#define OutputValue(arg, name) \
+ { if (RETVAL == 0) { \
+ SvGETMAGIC(arg) ; \
+ my_sv_setpvn(arg, (const char *)name.data, name.size) ; \
+ TAINT; \
+ SvTAINTED_on(arg); \
+ SvUTF8_off(arg); \
+ DBM_ckFilter(arg, filter_fetch_value,"filter_fetch_value") ; \
+ } \
+ }
+
+#define OutputKey(arg, name) \
+ { if (RETVAL == 0) \
+ { \
+ SvGETMAGIC(arg) ; \
+ if (db->type != DB_RECNO) { \
+ my_sv_setpvn(arg, (const char *)name.data, name.size); \
+ } \
+ else \
+ sv_setiv(arg, (I32)*(I32*)name.data - 1); \
+ TAINT; \
+ SvTAINTED_on(arg); \
+ SvUTF8_off(arg); \
+ DBM_ckFilter(arg, filter_fetch_key,"filter_fetch_key") ; \
+ } \
+ }
+
+/* Macro croak_and_free only for use in ParseOpenInfo */
+#define croak_and_free(x)
\
+ do
\
+ {
\
+ Safefree(RETVAL);
\
+ croak(x);
\
+ } while (0)
#define my_SvUV32(sv) ((u_int32_t)SvUV(sv))
@@ -473,18 +481,18 @@ extern void __getBerkeleyDBInfo(void);
#define MY_CXT_KEY "DB_File::_guts" XS_VERSION
typedef struct {
- recno_t x_Value;
- recno_t x_zero;
- DB_File x_CurrentDB;
- DBTKEY x_empty;
+ recno_t x_Value;
+ recno_t x_zero;
+ DB_File x_CurrentDB;
+ DBTKEY x_empty;
} my_cxt_t;
START_MY_CXT
-#define Value (MY_CXT.x_Value)
-#define zero (MY_CXT.x_zero)
-#define CurrentDB (MY_CXT.x_CurrentDB)
-#define empty (MY_CXT.x_empty)
+#define Value (MY_CXT.x_Value)
+#define zero (MY_CXT.x_zero)
+#define CurrentDB (MY_CXT.x_CurrentDB)
+#define empty (MY_CXT.x_empty)
#define ERR_BUFF "DB_File::Error"
@@ -495,52 +503,51 @@ static int
db_put(DB_File db, DBTKEY key, DBT value, u_int flags)
#else
db_put(db, key, value, flags)
-DB_File db ;
-DBTKEY key ;
-DBT value ;
-u_int flags ;
+DB_File db ;
+DBTKEY key ;
+DBT value ;
+u_int flags ;
#endif
{
int status ;
if (flagSet(flags, R_IAFTER) || flagSet(flags, R_IBEFORE)) {
DBC * temp_cursor ;
- DBT l_key, l_value;
-
+ DBT l_key, l_value;
+
#if DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR < 6
if (((db->dbp)->cursor)(db->dbp, NULL, &temp_cursor) != 0)
#else
if (((db->dbp)->cursor)(db->dbp, NULL, &temp_cursor, 0) != 0)
#endif
- return (-1) ;
+ return (-1) ;
+
+ memset(&l_key, 0, sizeof(l_key));
+ l_key.data = key.data;
+ l_key.size = key.size;
+ memset(&l_value, 0, sizeof(l_value));
+ l_value.data = value.data;
+ l_value.size = value.size;
- memset(&l_key, 0, sizeof(l_key));
- l_key.data = key.data;
- l_key.size = key.size;
- memset(&l_value, 0, sizeof(l_value));
- l_value.data = value.data;
- l_value.size = value.size;
+ if ( temp_cursor->c_get(temp_cursor, &l_key, &l_value, DB_SET) != 0) {
+ (void)temp_cursor->c_close(temp_cursor);
+ return (-1);
+ }
- if ( temp_cursor->c_get(temp_cursor, &l_key, &l_value, DB_SET) != 0) {
- (void)temp_cursor->c_close(temp_cursor);
- return (-1);
- }
+ status = temp_cursor->c_put(temp_cursor, &key, &value, flags);
+ (void)temp_cursor->c_close(temp_cursor);
- status = temp_cursor->c_put(temp_cursor, &key, &value, flags);
- (void)temp_cursor->c_close(temp_cursor);
-
return (status) ;
- }
-
-
+ }
+
+
if (flagSet(flags, R_CURSOR)) {
- return ((db->cursor)->c_put)(db->cursor, &key, &value, DB_CURRENT);
+ return ((db->cursor)->c_put)(db->cursor, &key, &value, DB_CURRENT);
}
if (flagSet(flags, R_SETCURSOR)) {
- if ((db->dbp)->put(db->dbp, NULL, &key, &value, 0) != 0)
- return -1 ;
+ if ((db->dbp)->put(db->dbp, NULL, &key, &value, 0) != 0)
+ return -1 ;
return ((db->cursor)->c_get)(db->cursor, &key, &value, DB_SET_RANGE);
-
}
return ((db->dbp)->put)(db->dbp, NULL, &key, &value, flags) ;
@@ -576,7 +583,7 @@ size_t* locp;
btree_compare(DB * db, const DBT *key1, const DBT *key2)
#else
btree_compare(db, key1, key2)
-DB * db ;
+DB * db ;
const DBT * key1 ;
const DBT * key2 ;
#endif /* CAN_PROTOTYPE */
@@ -597,13 +604,13 @@ const DBT * key2 ;
{
#ifdef dTHX
dTHX;
-#endif
+#endif
dSP ;
dMY_CXT ;
void * data1, * data2 ;
int retval ;
int count ;
-
+
#ifdef AT_LEAST_DB_3_2
PERL_UNUSED_ARG(db);
#endif
@@ -620,15 +627,15 @@ const DBT * key2 ;
data2 = (char *) key2->data ;
#ifndef newSVpvn
- /* As newSVpv will assume that the data pointer is a null terminated C
- string if the size parameter is 0, make sure that data points to an
+ /* As newSVpv will assume that the data pointer is a null terminated C
+ string if the size parameter is 0, make sure that data points to an
empty string if the length is 0
*/
if (key1->size == 0)
- data1 = "" ;
+ data1 = "" ;
if (key2->size == 0)
data2 = "" ;
-#endif
+#endif
ENTER ;
SAVETMPS;
@@ -643,7 +650,7 @@ const DBT * key2 ;
PUSHs(sv_2mortal(newSVpvn((const char*)data2,key2->size)));
PUTBACK ;
- count = perl_call_sv(CurrentDB->compare, G_SCALAR);
+ count = perl_call_sv(CurrentDB->compare, G_SCALAR);
SPAGAIN ;
@@ -688,13 +695,13 @@ const DBT * key2 ;
{
#ifdef dTHX
dTHX;
-#endif
+#endif
dSP ;
dMY_CXT ;
char * data1, * data2 ;
int retval ;
int count ;
-
+
#ifdef AT_LEAST_DB_3_2
PERL_UNUSED_ARG(db);
#endif
@@ -708,15 +715,15 @@ const DBT * key2 ;
data2 = (char *) key2->data ;
#ifndef newSVpvn
- /* As newSVpv will assume that the data pointer is a null terminated C
- string if the size parameter is 0, make sure that data points to an
+ /* As newSVpv will assume that the data pointer is a null terminated C
+ string if the size parameter is 0, make sure that data points to an
empty string if the length is 0
*/
if (key1->size == 0)
data1 = "" ;
if (key2->size == 0)
data2 = "" ;
-#endif
+#endif
ENTER ;
SAVETMPS;
@@ -731,7 +738,7 @@ const DBT * key2 ;
PUSHs(sv_2mortal(newSVpvn(data2,key2->size)));
PUTBACK ;
- count = perl_call_sv(CurrentDB->prefix, G_SCALAR);
+ count = perl_call_sv(CurrentDB->prefix, G_SCALAR);
SPAGAIN ;
@@ -739,9 +746,9 @@ const DBT * key2 ;
tidyUp(CurrentDB);
croak ("DB_File btree_prefix: expected 1 return value from prefix sub,
got %d\n", count) ;
}
-
+
retval = POPi ;
-
+
PUTBACK ;
FREETMPS ;
LEAVE ;
@@ -782,7 +789,7 @@ HASH_CB_SIZE_TYPE size ;
{
#ifdef dTHX
dTHX;
-#endif
+#endif
dSP ;
dMY_CXT;
int retval = 0;
@@ -800,7 +807,7 @@ HASH_CB_SIZE_TYPE size ;
#ifndef newSVpvn
if (size == 0)
data = "" ;
-#endif
+#endif
/* DGH - Next two lines added to fix corrupted stack problem */
ENTER ;
@@ -816,7 +823,7 @@ HASH_CB_SIZE_TYPE size ;
XPUSHs(sv_2mortal(newSVpvn((char*)data,size)));
PUTBACK ;
- count = perl_call_sv(CurrentDB->hash, G_SCALAR);
+ count = perl_call_sv(CurrentDB->hash, G_SCALAR);
SPAGAIN ;
@@ -845,7 +852,7 @@ db_errcall_cb(const char * db_errpfx, char * buffer)
{
#ifdef dTHX
dTHX;
-#endif
+#endif
SV * sv = perl_get_sv(ERR_BUFF, FALSE) ;
#ifdef AT_LEAST_DB_4_3
PERL_UNUSED_ARG(dbenv);
@@ -856,7 +863,7 @@ db_errcall_cb(const char * db_errpfx, char * buffer)
else
sv_setpv(sv, buffer) ;
}
-}
+}
#endif
#if defined(TRACE) && defined(BERKELEY_DB_1_OR_2)
@@ -870,8 +877,8 @@ INFO * hash ;
#endif
{
printf ("HASH Info\n") ;
- printf (" hash = %s\n",
- (hash->db_HA_hash != NULL ? "redefined" : "default")) ;
+ printf (" hash = %s\n",
+ (hash->db_HA_hash != NULL ? "redefined" : "default")) ;
printf (" bsize = %d\n", hash->db_HA_bsize) ;
printf (" ffactor = %d\n", hash->db_HA_ffactor) ;
printf (" nelem = %d\n", hash->db_HA_nelem) ;
@@ -907,10 +914,10 @@ INFO * btree ;
#endif
{
printf ("BTREE Info\n") ;
- printf (" compare = %s\n",
- (btree->db_BT_compare ? "redefined" : "default")) ;
- printf (" prefix = %s\n",
- (btree->db_BT_prefix ? "redefined" : "default")) ;
+ printf (" compare = %s\n",
+ (btree->db_BT_compare ? "redefined" : "default")) ;
+ printf (" prefix = %s\n",
+ (btree->db_BT_prefix ? "redefined" : "default")) ;
printf (" flags = %d\n", btree->db_BT_flags) ;
printf (" cachesize = %d\n", btree->db_BT_cachesize) ;
printf (" psize = %d\n", btree->db_BT_psize) ;
@@ -938,9 +945,9 @@ GetArrayLength(db)
DB_File db ;
#endif
{
- DBT key ;
- DBT value ;
- int RETVAL ;
+ DBT key ;
+ DBT value ;
+ int RETVAL ;
DBT_clear(key) ;
DBT_clear(value) ;
@@ -963,16 +970,16 @@ I32 value ;
#endif
{
if (value < 0) {
- /* Get the length of the array */
- I32 length = GetArrayLength(aTHX_ db) ;
+ /* Get the length of the array */
+ I32 length = GetArrayLength(aTHX_ db) ;
- /* check for attempt to write before start of array */
- if (length + value + 1 <= 0) {
+ /* check for attempt to write before start of array */
+ if (length + value + 1 <= 0) {
tidyUp(db);
- croak("Modification of non-creatable array value attempted,
subscript %ld", (long)value) ;
- }
+ croak("Modification of non-creatable array value attempted,
subscript %ld", (long)value) ;
+ }
- value = length + value + 1 ;
+ value = length + value + 1 ;
}
else
++ value ;
@@ -996,29 +1003,29 @@ SV * sv ;
#ifdef BERKELEY_DB_1_OR_2 /* Berkeley DB Version 1 or 2 */
- SV ** svp;
- HV * action ;
- DB_File RETVAL = (DB_File)safemalloc(sizeof(DB_File_type)) ;
- void * openinfo = NULL ;
- INFO * info = &RETVAL->info ;
- STRLEN n_a;
+ SV ** svp;
+ HV * action ;
+ DB_File RETVAL = (DB_File)safemalloc(sizeof(DB_File_type)) ;
+ void * openinfo = NULL ;
+ INFO * info = &RETVAL->info ;
+ STRLEN n_a;
dMY_CXT;
-#ifdef TRACE
- printf("In ParseOpenInfo name=[%s] flags=[%d] mode=[%d] SV NULL=[%d]\n",
- name, flags, mode, sv == NULL) ;
+#ifdef TRACE
+ printf("In ParseOpenInfo name=[%s] flags=[%d] mode=[%d] SV NULL=[%d]\n",
+ name, flags, mode, sv == NULL) ;
#endif
Zero(RETVAL, 1, DB_File_type) ;
/* Default to HASH */
RETVAL->filtering = 0 ;
- RETVAL->filter_fetch_key = RETVAL->filter_store_key =
+ RETVAL->filter_fetch_key = RETVAL->filter_store_key =
RETVAL->filter_fetch_value = RETVAL->filter_store_value =
RETVAL->hash = RETVAL->compare = RETVAL->prefix = NULL ;
RETVAL->type = DB_HASH ;
/* DGH - Next line added to avoid SEGV on existing hash DB */
- CurrentDB = RETVAL;
+ CurrentDB = RETVAL;
/* fd for 1.86 hash in memory files doesn't return -1 like 1.85 */
RETVAL->in_memory = (name == NULL) ;
@@ -1026,63 +1033,63 @@ SV * sv ;
if (sv)
{
if (! SvROK(sv) )
- croak ("type parameter is not a reference") ;
+ croak_and_free("type parameter is not a reference") ;
svp = hv_fetch( (HV*)SvRV(sv), "GOT", 3, FALSE) ;
if (svp && SvOK(*svp))
action = (HV*) SvRV(*svp) ;
- else
- croak("internal error") ;
+ else
+ croak_and_free("internal error") ;
if (sv_isa(sv, "DB_File::HASHINFO"))
{
- if (!isHASH)
- croak("DB_File can only tie an associative array to a DB_HASH
database") ;
+ if (!isHASH)
+ croak_and_free("DB_File can only tie an associative array to a
DB_HASH database") ;
RETVAL->type = DB_HASH ;
openinfo = (void*)info ;
-
- svp = hv_fetch(action, "hash", 4, FALSE);
+
+ svp = hv_fetch(action, "hash", 4, FALSE);
if (svp && SvOK(*svp))
{
info->db_HA_hash = hash_cb ;
- RETVAL->hash = newSVsv(*svp) ;
+ RETVAL->hash = newSVsv(*svp) ;
}
else
- info->db_HA_hash = NULL ;
+ info->db_HA_hash = NULL ;
- svp = hv_fetch(action, "ffactor", 7, FALSE);
- info->db_HA_ffactor = svp ? SvIV(*svp) : 0;
-
- svp = hv_fetch(action, "nelem", 5, FALSE);
- info->db_HA_nelem = svp ? SvIV(*svp) : 0;
-
- svp = hv_fetch(action, "bsize", 5, FALSE);
- info->db_HA_bsize = svp ? SvIV(*svp) : 0;
-
- svp = hv_fetch(action, "cachesize", 9, FALSE);
- info->db_HA_cachesize = svp ? SvIV(*svp) : 0;
-
- svp = hv_fetch(action, "lorder", 6, FALSE);
- info->db_HA_lorder = svp ? SvIV(*svp) : 0;
+ svp = hv_fetch(action, "ffactor", 7, FALSE);
+ info->db_HA_ffactor = svp ? SvIV(*svp) : 0;
+
+ svp = hv_fetch(action, "nelem", 5, FALSE);
+ info->db_HA_nelem = svp ? SvIV(*svp) : 0;
- PrintHash(info) ;
+ svp = hv_fetch(action, "bsize", 5, FALSE);
+ info->db_HA_bsize = svp ? SvIV(*svp) : 0;
+
+ svp = hv_fetch(action, "cachesize", 9, FALSE);
+ info->db_HA_cachesize = svp ? SvIV(*svp) : 0;
+
+ svp = hv_fetch(action, "lorder", 6, FALSE);
+ info->db_HA_lorder = svp ? SvIV(*svp) : 0;
+
+ PrintHash(info) ;
}
else if (sv_isa(sv, "DB_File::BTREEINFO"))
{
- if (!isHASH)
- croak("DB_File can only tie an associative array to a DB_BTREE
database");
+ if (!isHASH)
+ croak_and_free("DB_File can only tie an associative array to a
DB_BTREE database");
RETVAL->type = DB_BTREE ;
openinfo = (void*)info ;
-
+
svp = hv_fetch(action, "compare", 7, FALSE);
if (svp && SvOK(*svp))
{
info->db_BT_compare = btree_compare ;
- RETVAL->compare = newSVsv(*svp) ;
+ RETVAL->compare = newSVsv(*svp) ;
}
else
info->db_BT_compare = NULL ;
@@ -1091,127 +1098,127 @@ SV * sv ;
if (svp && SvOK(*svp))
{
info->db_BT_prefix = btree_prefix ;
- RETVAL->prefix = newSVsv(*svp) ;
+ RETVAL->prefix = newSVsv(*svp) ;
}
else
info->db_BT_prefix = NULL ;
svp = hv_fetch(action, "flags", 5, FALSE);
info->db_BT_flags = svp ? SvIV(*svp) : 0;
-
+
svp = hv_fetch(action, "cachesize", 9, FALSE);
info->db_BT_cachesize = svp ? SvIV(*svp) : 0;
-
+
#ifndef DB_VERSION_MAJOR
svp = hv_fetch(action, "minkeypage", 10, FALSE);
info->btree.minkeypage = svp ? SvIV(*svp) : 0;
-
+
svp = hv_fetch(action, "maxkeypage", 10, FALSE);
info->btree.maxkeypage = svp ? SvIV(*svp) : 0;
#endif
svp = hv_fetch(action, "psize", 5, FALSE);
info->db_BT_psize = svp ? SvIV(*svp) : 0;
-
+
svp = hv_fetch(action, "lorder", 6, FALSE);
info->db_BT_lorder = svp ? SvIV(*svp) : 0;
PrintBtree(info) ;
-
+
}
else if (sv_isa(sv, "DB_File::RECNOINFO"))
{
- if (isHASH)
- croak("DB_File can only tie an array to a DB_RECNO database");
+ if (isHASH)
+ croak_and_free("DB_File can only tie an array to a DB_RECNO
database");
RETVAL->type = DB_RECNO ;
openinfo = (void *)info ;
- info->db_RE_flags = 0 ;
+ info->db_RE_flags = 0 ;
svp = hv_fetch(action, "flags", 5, FALSE);
info->db_RE_flags = (u_long) (svp ? SvIV(*svp) : 0);
-
+
svp = hv_fetch(action, "reclen", 6, FALSE);
info->db_RE_reclen = (size_t) (svp ? SvIV(*svp) : 0);
-
+
svp = hv_fetch(action, "cachesize", 9, FALSE);
info->db_RE_cachesize = (u_int) (svp ? SvIV(*svp) : 0);
-
+
svp = hv_fetch(action, "psize", 5, FALSE);
info->db_RE_psize = (u_int) (svp ? SvIV(*svp) : 0);
-
+
svp = hv_fetch(action, "lorder", 6, FALSE);
info->db_RE_lorder = (int) (svp ? SvIV(*svp) : 0);
#ifdef DB_VERSION_MAJOR
- info->re_source = name ;
- name = NULL ;
+ info->re_source = name ;
+ name = NULL ;
#endif
- svp = hv_fetch(action, "bfname", 6, FALSE);
+ svp = hv_fetch(action, "bfname", 6, FALSE);
if (svp && SvOK(*svp)) {
- char * ptr = SvPV(*svp,n_a) ;
+ char * ptr = SvPV(*svp,n_a) ;
#ifdef DB_VERSION_MAJOR
- name = (char*) n_a ? ptr : NULL ;
+ name = (char*) n_a ? ptr : NULL ;
#else
info->db_RE_bfname = (char*) (n_a ? ptr : NULL) ;
#endif
- }
- else
+ }
+ else
#ifdef DB_VERSION_MAJOR
- name = NULL ;
+ name = NULL ;
#else
- info->db_RE_bfname = NULL ;
+ info->db_RE_bfname = NULL ;
#endif
-
- svp = hv_fetch(action, "bval", 4, FALSE);
+
+ svp = hv_fetch(action, "bval", 4, FALSE);
#ifdef DB_VERSION_MAJOR
if (svp && SvOK(*svp))
{
- int value ;
+ int value ;
if (SvPOK(*svp))
- value = (int)*SvPV(*svp, n_a) ;
- else
- value = SvIV(*svp) ;
-
- if (info->flags & DB_FIXEDLEN) {
- info->re_pad = value ;
- info->flags |= DB_PAD ;
- }
- else {
- info->re_delim = value ;
- info->flags |= DB_DELIMITER ;
- }
+ value = (int)*SvPV(*svp, n_a) ;
+ else
+ value = SvIV(*svp) ;
+
+ if (info->flags & DB_FIXEDLEN) {
+ info->re_pad = value ;
+ info->flags |= DB_PAD ;
+ }
+ else {
+ info->re_delim = value ;
+ info->flags |= DB_DELIMITER ;
+ }
}
#else
if (svp && SvOK(*svp))
{
if (SvPOK(*svp))
- info->db_RE_bval = (u_char)*SvPV(*svp, n_a) ;
- else
- info->db_RE_bval = (u_char)(unsigned long) SvIV(*svp) ;
- DB_flags(info->flags, DB_DELIMITER) ;
+ info->db_RE_bval = (u_char)*SvPV(*svp, n_a) ;
+ else
+ info->db_RE_bval = (u_char)(unsigned long) SvIV(*svp) ;
+ DB_flags(info->flags, DB_DELIMITER) ;
}
else
- {
- if (info->db_RE_flags & R_FIXEDLEN)
+ {
+ if (info->db_RE_flags & R_FIXEDLEN)
info->db_RE_bval = (u_char) ' ' ;
- else
+ else
info->db_RE_bval = (u_char) '\n' ;
- DB_flags(info->flags, DB_DELIMITER) ;
- }
+ DB_flags(info->flags, DB_DELIMITER) ;
+ }
#endif
#ifdef DB_RENUMBER
- info->flags |= DB_RENUMBER ;
+ info->flags |= DB_RENUMBER ;
#endif
-
+
PrintRecno(info) ;
}
else
- croak("type is not of type DB_File::HASHINFO, DB_File::BTREEINFO
or DB_File::RECNOINFO");
+ croak_and_free("type is not of type DB_File::HASHINFO,
DB_File::BTREEINFO or DB_File::RECNOINFO");
}
@@ -1225,8 +1232,8 @@ SV * sv ;
#ifdef DB_VERSION_MAJOR
{
- int Flags = 0 ;
- int status ;
+ int Flags = 0 ;
+ int status ;
/* Map 1.x flags to 2.x flags */
if ((flags & O_CREAT) == O_CREAT)
@@ -1244,25 +1251,23 @@ SV * sv ;
Flags |= DB_TRUNCATE ;
#endif
- status = db_open(name, RETVAL->type, Flags, mode, NULL,
(DB_INFO*)openinfo, &RETVAL->dbp) ;
+ status = db_open(name, RETVAL->type, Flags, mode, NULL,
(DB_INFO*)openinfo, &RETVAL->dbp) ;
if (status == 0)
#if DB_VERSION_MAJOR == 2 && DB_VERSION_MINOR < 6
status = (RETVAL->dbp->cursor)(RETVAL->dbp, NULL, &RETVAL->cursor)
;
#else
- status = (RETVAL->dbp->cursor)(RETVAL->dbp, NULL, &RETVAL->cursor,
- 0) ;
+ status = (RETVAL->dbp->cursor)(RETVAL->dbp, NULL, &RETVAL->cursor,
0) ;
#endif
if (status)
- RETVAL->dbp = NULL ;
-
+ RETVAL->dbp = NULL ;
}
#else
#if defined(DB_LIBRARY_COMPATIBILITY_API) && DB_VERSION_MAJOR > 2
- RETVAL->dbp = __db185_open(name, flags, mode, RETVAL->type, openinfo) ;
-#else
- RETVAL->dbp = dbopen(name, flags, mode, RETVAL->type, openinfo) ;
+ RETVAL->dbp = __db185_open(name, flags, mode, RETVAL->type, openinfo) ;
+#else
+ RETVAL->dbp = dbopen(name, flags, mode, RETVAL->type, openinfo) ;
#endif /* DB_LIBRARY_COMPATIBILITY_API */
#endif
@@ -1271,12 +1276,12 @@ SV * sv ;
#else /* Berkeley DB Version > 2 */
- SV ** svp;
- HV * action ;
- DB_File RETVAL = (DB_File)safemalloc(sizeof(DB_File_type)) ;
- DB * dbp ;
- STRLEN n_a;
- int status ;
+ SV ** svp;
+ HV * action ;
+ DB_File RETVAL = (DB_File)safemalloc(sizeof(DB_File_type)) ;
+ DB * dbp ;
+ STRLEN n_a;
+ int status ;
dMY_CXT;
/* printf("In ParseOpenInfo name=[%s] flags=[%d] mode = [%d]\n", name, flags,
mode) ; */
@@ -1284,13 +1289,13 @@ SV * sv ;
/* Default to HASH */
RETVAL->filtering = 0 ;
- RETVAL->filter_fetch_key = RETVAL->filter_store_key =
+ RETVAL->filter_fetch_key = RETVAL->filter_store_key =
RETVAL->filter_fetch_value = RETVAL->filter_store_value =
RETVAL->hash = RETVAL->compare = RETVAL->prefix = NULL ;
RETVAL->type = DB_HASH ;
/* DGH - Next line added to avoid SEGV on existing hash DB */
- CurrentDB = RETVAL;
+ CurrentDB = RETVAL;
/* fd for 1.86 hash in memory files doesn't return -1 like 1.85 */
RETVAL->in_memory = (name == NULL) ;
@@ -1298,191 +1303,191 @@ SV * sv ;
status = db_create(&RETVAL->dbp, NULL,0) ;
/* printf("db_create returned %d %s\n", status, db_strerror(status)) ; */
if (status) {
- RETVAL->dbp = NULL ;
+ RETVAL->dbp = NULL ;
return (RETVAL) ;
- }
+ }
dbp = RETVAL->dbp ;
#ifdef WANT_ERROR
- RETVAL->dbp->set_errcall(RETVAL->dbp, db_errcall_cb) ;
+ RETVAL->dbp->set_errcall(RETVAL->dbp, db_errcall_cb) ;
#endif
if (sv)
{
if (! SvROK(sv) )
- croak ("type parameter is not a reference") ;
+ croak_and_free("type parameter is not a reference") ;
svp = hv_fetch( (HV*)SvRV(sv), "GOT", 3, FALSE) ;
if (svp && SvOK(*svp))
action = (HV*) SvRV(*svp) ;
- else
- croak("internal error") ;
+ else
+ croak_and_free("internal error") ;
if (sv_isa(sv, "DB_File::HASHINFO"))
{
- if (!isHASH)
- croak("DB_File can only tie an associative array to a DB_HASH
database") ;
+ if (!isHASH)
+ croak_and_free("DB_File can only tie an associative array to a
DB_HASH database") ;
RETVAL->type = DB_HASH ;
-
- svp = hv_fetch(action, "hash", 4, FALSE);
+
+ svp = hv_fetch(action, "hash", 4, FALSE);
if (svp && SvOK(*svp))
{
- (void)dbp->set_h_hash(dbp, hash_cb) ;
- RETVAL->hash = newSVsv(*svp) ;
+ (void)dbp->set_h_hash(dbp, hash_cb) ;
+ RETVAL->hash = newSVsv(*svp) ;
}
svp = hv_fetch(action, "ffactor", 7, FALSE);
- if (svp)
- (void)dbp->set_h_ffactor(dbp, my_SvUV32(*svp)) ;
-
+ if (svp)
+ (void)dbp->set_h_ffactor(dbp, my_SvUV32(*svp)) ;
+
svp = hv_fetch(action, "nelem", 5, FALSE);
- if (svp)
+ if (svp)
(void)dbp->set_h_nelem(dbp, my_SvUV32(*svp)) ;
-
+
svp = hv_fetch(action, "bsize", 5, FALSE);
- if (svp)
+ if (svp)
(void)dbp->set_pagesize(dbp, my_SvUV32(*svp));
-
+
svp = hv_fetch(action, "cachesize", 9, FALSE);
- if (svp)
+ if (svp)
(void)dbp->set_cachesize(dbp, 0, my_SvUV32(*svp), 0) ;
-
+
svp = hv_fetch(action, "lorder", 6, FALSE);
- if (svp)
+ if (svp)
(void)dbp->set_lorder(dbp, (int)SvIV(*svp)) ;
- PrintHash(info) ;
+ PrintHash(info) ;
}
else if (sv_isa(sv, "DB_File::BTREEINFO"))
{
- if (!isHASH)
- croak("DB_File can only tie an associative array to a DB_BTREE
database");
+ if (!isHASH)
+ croak_and_free("DB_File can only tie an associative array to a
DB_BTREE database");
RETVAL->type = DB_BTREE ;
-
+
svp = hv_fetch(action, "compare", 7, FALSE);
if (svp && SvOK(*svp))
{
(void)dbp->set_bt_compare(dbp, btree_compare) ;
- RETVAL->compare = newSVsv(*svp) ;
+ RETVAL->compare = newSVsv(*svp) ;
}
svp = hv_fetch(action, "prefix", 6, FALSE);
if (svp && SvOK(*svp))
{
(void)dbp->set_bt_prefix(dbp, btree_prefix) ;
- RETVAL->prefix = newSVsv(*svp) ;
+ RETVAL->prefix = newSVsv(*svp) ;
}
svp = hv_fetch(action, "flags", 5, FALSE);
- if (svp)
- (void)dbp->set_flags(dbp, my_SvUV32(*svp)) ;
-
+ if (svp)
+ (void)dbp->set_flags(dbp, my_SvUV32(*svp)) ;
+
svp = hv_fetch(action, "cachesize", 9, FALSE);
- if (svp)
+ if (svp)
(void)dbp->set_cachesize(dbp, 0, my_SvUV32(*svp), 0) ;
-
+
svp = hv_fetch(action, "psize", 5, FALSE);
- if (svp)
+ if (svp)
(void)dbp->set_pagesize(dbp, my_SvUV32(*svp)) ;
-
+
svp = hv_fetch(action, "lorder", 6, FALSE);
- if (svp)
+ if (svp)
(void)dbp->set_lorder(dbp, (int)SvIV(*svp)) ;
- PrintBtree(info) ;
-
+ PrintBtree(info) ;
+
}
else if (sv_isa(sv, "DB_File::RECNOINFO"))
{
- int fixed = FALSE ;
+ int fixed = FALSE ;
- if (isHASH)
- croak("DB_File can only tie an array to a DB_RECNO database");
+ if (isHASH)
+ croak_and_free("DB_File can only tie an array to a DB_RECNO
database");
RETVAL->type = DB_RECNO ;
- svp = hv_fetch(action, "flags", 5, FALSE);
- if (svp) {
- int flags = SvIV(*svp) ;
- /* remove FIXDLEN, if present */
- if (flags & DB_FIXEDLEN) {
- fixed = TRUE ;
- flags &= ~DB_FIXEDLEN ;
- }
- }
+ svp = hv_fetch(action, "flags", 5, FALSE);
+ if (svp) {
+ int flags = SvIV(*svp) ;
+ /* remove FIXDLEN, if present */
+ if (flags & DB_FIXEDLEN) {
+ fixed = TRUE ;
+ flags &= ~DB_FIXEDLEN ;
+ }
+ }
- svp = hv_fetch(action, "cachesize", 9, FALSE);
- if (svp) {
- status = dbp->set_cachesize(dbp, 0, my_SvUV32(*svp), 0) ;
- }
-
- svp = hv_fetch(action, "psize", 5, FALSE);
- if (svp) {
- status = dbp->set_pagesize(dbp, my_SvUV32(*svp)) ;
- }
-
- svp = hv_fetch(action, "lorder", 6, FALSE);
- if (svp) {
- status = dbp->set_lorder(dbp, (int)SvIV(*svp)) ;
- }
+ svp = hv_fetch(action, "cachesize", 9, FALSE);
+ if (svp) {
+ status = dbp->set_cachesize(dbp, 0, my_SvUV32(*svp), 0) ;
+ }
- svp = hv_fetch(action, "bval", 4, FALSE);
+ svp = hv_fetch(action, "psize", 5, FALSE);
+ if (svp) {
+ status = dbp->set_pagesize(dbp, my_SvUV32(*svp)) ;
+ }
+
+ svp = hv_fetch(action, "lorder", 6, FALSE);
+ if (svp) {
+ status = dbp->set_lorder(dbp, (int)SvIV(*svp)) ;
+ }
+
+ svp = hv_fetch(action, "bval", 4, FALSE);
if (svp && SvOK(*svp))
{
- int value ;
+ int value ;
if (SvPOK(*svp))
- value = (int)*SvPV(*svp, n_a) ;
- else
- value = (int)SvIV(*svp) ;
+ value = (int)*SvPV(*svp, n_a) ;
+ else
+ value = (int)SvIV(*svp) ;
+
+ if (fixed) {
+ (void)dbp->set_re_pad(dbp, value) ;
+ }
+ else {
+ (void)dbp->set_re_delim(dbp, value) ;
+ }
- if (fixed) {
- (void)dbp->set_re_pad(dbp, value) ;
- }
- else {
- (void)dbp->set_re_delim(dbp, value) ;
- }
+ }
+ if (fixed) {
+ svp = hv_fetch(action, "reclen", 6, FALSE);
+ if (svp) {
+ u_int32_t len = my_SvUV32(*svp) ;
+ (void)dbp->set_re_len(dbp, len) ;
+ }
}
- if (fixed) {
- svp = hv_fetch(action, "reclen", 6, FALSE);
- if (svp) {
- u_int32_t len = my_SvUV32(*svp) ;
- (void)dbp->set_re_len(dbp, len) ;
- }
- }
-
- if (name != NULL) {
- (void)dbp->set_re_source(dbp, name) ;
- name = NULL ;
- }
-
- svp = hv_fetch(action, "bfname", 6, FALSE);
+ if (name != NULL) {
+ (void)dbp->set_re_source(dbp, name) ;
+ name = NULL ;
+ }
+
+ svp = hv_fetch(action, "bfname", 6, FALSE);
if (svp && SvOK(*svp)) {
- char * ptr = SvPV(*svp,n_a) ;
- name = (char*) n_a ? ptr : NULL ;
- }
- else
- name = NULL ;
-
-
- (void)dbp->set_flags(dbp, (u_int32_t)DB_RENUMBER) ;
-
- if (flags){
- (void)dbp->set_flags(dbp, (u_int32_t)flags) ;
- }
+ char * ptr = SvPV(*svp,n_a) ;
+ name = (char*) n_a ? ptr : NULL ;
+ }
+ else
+ name = NULL ;
+
+
+ (void)dbp->set_flags(dbp, (u_int32_t)DB_RENUMBER) ;
+
+ if (flags){
+ (void)dbp->set_flags(dbp, (u_int32_t)flags) ;
+ }
PrintRecno(info) ;
}
else
- croak("type is not of type DB_File::HASHINFO, DB_File::BTREEINFO
or DB_File::RECNOINFO");
+ croak_and_free("type is not of type DB_File::HASHINFO,
DB_File::BTREEINFO or DB_File::RECNOINFO");
}
{
- u_int32_t Flags = 0 ;
- int status ;
+ u_int32_t Flags = 0 ;
+ int status ;
/* Map 1.x flags to 3.x flags */
if ((flags & O_CREAT) == O_CREAT)
@@ -1507,27 +1512,25 @@ SV * sv ;
#endif
#ifdef AT_LEAST_DB_4_1
- status = (RETVAL->dbp->open)(RETVAL->dbp, NULL, name, NULL,
RETVAL->type,
- Flags, mode) ;
+ status = (RETVAL->dbp->open)(RETVAL->dbp, NULL, name, NULL,
RETVAL->type,
+ Flags, mode) ;
#else
- status = (RETVAL->dbp->open)(RETVAL->dbp, name, NULL, RETVAL->type,
- Flags, mode) ;
+ status = (RETVAL->dbp->open)(RETVAL->dbp, name, NULL, RETVAL->type,
+ Flags, mode) ;
#endif
- /* printf("open returned %d %s\n", status, db_strerror(status)) ; */
+ /* printf("open returned %d %s\n", status, db_strerror(status)) ; */
if (status == 0) {
- status = (RETVAL->dbp->cursor)(RETVAL->dbp, NULL, &RETVAL->cursor,
- 0) ;
- /* printf("cursor returned %d %s\n", status, db_strerror(status)) ;
*/
- }
+ status = (RETVAL->dbp->cursor)(RETVAL->dbp, NULL, &RETVAL->cursor,
0) ;
+ /* printf("cursor returned %d %s\n", status, db_strerror(status))
; */
+ }
if (status)
- {
- db_close(RETVAL); /* close **dbp handle to prevent mem.leak */
- RETVAL->dbp = NULL ;
- }
-
+ {
+ db_close(RETVAL); /* close **dbp handle to prevent mem.leak */
+ RETVAL->dbp = NULL ;
+ }
}
return (RETVAL) ;
@@ -1537,9 +1540,9 @@ SV * sv ;
} /* ParseOpenInfo */
-#include "constants.h"
+#include "constants.h"
-MODULE = DB_File PACKAGE = DB_File PREFIX = db_
+MODULE = DB_File PACKAGE = DB_File PREFIX = db_
INCLUDE: constants.xs
@@ -1547,17 +1550,17 @@ BOOT:
{
#ifdef dTHX
dTHX;
-#endif
+#endif
#ifdef WANT_ERROR
- SV * sv_err = perl_get_sv(ERR_BUFF, GV_ADD|GV_ADDMULTI) ;
+ SV * sv_err = perl_get_sv(ERR_BUFF, GV_ADD|GV_ADDMULTI) ;
#endif
MY_CXT_INIT;
#ifdef WANT_ERROR
PERL_UNUSED_VAR(sv_err); /* huh? we just retrieved it... */
#endif
__getBerkeleyDBInfo() ;
-
- DBT_clear(empty) ;
+
+ DBT_clear(empty) ;
empty.data = &zero ;
empty.size = sizeof(recno_t) ;
}
@@ -1566,161 +1569,161 @@ BOOT:
DB_File
db_DoTie_(isHASH, dbtype, name=undef, flags=O_CREAT|O_RDWR, mode=0666,
type=DB_HASH)
- int isHASH
- char * dbtype
- int flags
- int mode
- CODE:
- {
- char * name = (char *) NULL ;
- SV * sv = (SV *) NULL ;
- STRLEN n_a;
-
- if (items >= 3 && SvOK(ST(2)))
- name = (char*) SvPV(ST(2), n_a) ;
-
- if (items == 6)
- sv = ST(5) ;
-
- RETVAL = ParseOpenInfo(aTHX_ isHASH, name, flags, mode, sv) ;
- Trace(("db_DoTie_ %p\n", RETVAL));
- if (RETVAL->dbp == NULL) {
- Safefree(RETVAL);
- RETVAL = NULL ;
- }
- }
- OUTPUT:
- RETVAL
+ int isHASH
+ char * dbtype
+ int flags
+ int mode
+ CODE:
+ {
+ char * name = (char *) NULL ;
+ SV * sv = (SV *) NULL ;
+ STRLEN n_a;
+
+ if (items >= 3 && SvOK(ST(2)))
+ name = (char*) SvPV(ST(2), n_a) ;
+
+ if (items == 6)
+ sv = ST(5) ;
+
+ RETVAL = ParseOpenInfo(aTHX_ isHASH, name, flags, mode, sv) ;
+ Trace(("db_DoTie_ %p\n", RETVAL));
+ if (RETVAL->dbp == NULL) {
+ Safefree(RETVAL);
+ RETVAL = NULL ;
+ }
+ }
+ OUTPUT:
+ RETVAL
int
db_DESTROY(db)
- DB_File db
- PREINIT:
- dMY_CXT;
- INIT:
- CurrentDB = db ;
- Trace(("DESTROY %p\n", db));
- CLEANUP:
- Trace(("DESTROY %p done\n", db));
- if (db->hash)
- SvREFCNT_dec(db->hash) ;
- if (db->compare)
- SvREFCNT_dec(db->compare) ;
- if (db->prefix)
- SvREFCNT_dec(db->prefix) ;
- if (db->filter_fetch_key)
- SvREFCNT_dec(db->filter_fetch_key) ;
- if (db->filter_store_key)
- SvREFCNT_dec(db->filter_store_key) ;
- if (db->filter_fetch_value)
- SvREFCNT_dec(db->filter_fetch_value) ;
- if (db->filter_store_value)
- SvREFCNT_dec(db->filter_store_value) ;
- safefree(db) ;
+ DB_File db
+ PREINIT:
+ dMY_CXT;
+ INIT:
+ CurrentDB = db ;
+ Trace(("DESTROY %p\n", db));
+ CLEANUP:
+ Trace(("DESTROY %p done\n", db));
+ if (db->hash)
+ SvREFCNT_dec(db->hash) ;
+ if (db->compare)
+ SvREFCNT_dec(db->compare) ;
+ if (db->prefix)
+ SvREFCNT_dec(db->prefix) ;
+ if (db->filter_fetch_key)
+ SvREFCNT_dec(db->filter_fetch_key) ;
+ if (db->filter_store_key)
+ SvREFCNT_dec(db->filter_store_key) ;
+ if (db->filter_fetch_value)
+ SvREFCNT_dec(db->filter_fetch_value) ;
+ if (db->filter_store_value)
+ SvREFCNT_dec(db->filter_store_value) ;
+ safefree(db) ;
#ifdef DB_VERSION_MAJOR
- if (RETVAL > 0)
- RETVAL = -1 ;
+ if (RETVAL > 0)
+ RETVAL = -1 ;
#endif
int
db_DELETE(db, key, flags=0)
- DB_File db
- DBTKEY key
- u_int flags
- PREINIT:
- dMY_CXT;
- INIT:
- (void)flags;
- CurrentDB = db ;
+ DB_File db
+ DBTKEY key
+ u_int flags
+ PREINIT:
+ dMY_CXT;
+ INIT:
+ (void)flags;
+ CurrentDB = db ;
int
db_EXISTS(db, key)
- DB_File db
- DBTKEY key
- PREINIT:
- dMY_CXT;
- CODE:
- {
- DBT value ;
-
- DBT_clear(value) ;
- CurrentDB = db ;
- RETVAL = (((db->dbp)->get)(db->dbp, TXN &key, &value, 0) == 0) ;
- }
- OUTPUT:
- RETVAL
+ DB_File db
+ DBTKEY key
+ PREINIT:
+ dMY_CXT;
+ CODE:
+ {
+ DBT value ;
+
+ DBT_clear(value) ;
+ CurrentDB = db ;
+ RETVAL = (((db->dbp)->get)(db->dbp, TXN &key, &value, 0) == 0) ;
+ }
+ OUTPUT:
+ RETVAL
void
db_FETCH(db, key, flags=0)
- DB_File db
- DBTKEY key
- u_int flags
- PREINIT:
- dMY_CXT ;
- int RETVAL ;
- CODE:
- {
- DBT value ;
-
- DBT_clear(value) ;
- CurrentDB = db ;
- RETVAL = db_get(db, key, value, flags) ;
- ST(0) = sv_newmortal();
- OutputValue(ST(0), value)
- }
+ DB_File db
+ DBTKEY key
+ u_int flags
+ PREINIT:
+ dMY_CXT ;
+ int RETVAL ;
+ CODE:
+ {
+ DBT value ;
+
+ DBT_clear(value) ;
+ CurrentDB = db ;
+ RETVAL = db_get(db, key, value, flags) ;
+ ST(0) = sv_newmortal();
+ OutputValue(ST(0), value)
+ }
int
db_STORE(db, key, value, flags=0)
- DB_File db
- DBTKEY key
- DBT value
- u_int flags
- PREINIT:
- dMY_CXT;
- INIT:
- (void)flags;
- CurrentDB = db ;
+ DB_File db
+ DBTKEY key
+ DBT value
+ u_int flags
+ PREINIT:
+ dMY_CXT;
+ INIT:
+ (void)flags;
+ CurrentDB = db ;
void
db_FIRSTKEY(db)
- DB_File db
... 705 lines suppressed ...
--
Perl5 Master Repository
