Change 14944 by ams@lustre on 2002/03/02 13:54:35
Subject: [PATCH] DB_File 1.803
From: "Paul Marquess" <[EMAIL PROTECTED]>
Date: Sat, 2 Mar 2002 14:33:32 -0000
Message-Id: <[EMAIL PROTECTED]>
Affected files ...
.... //depot/perl/ext/DB_File/Changes#22 edit
.... //depot/perl/ext/DB_File/DB_File.pm#39 edit
.... //depot/perl/ext/DB_File/DB_File.xs#57 edit
.... //depot/perl/ext/DB_File/t/db-btree.t#10 edit
Differences ...
==== //depot/perl/ext/DB_File/Changes#22 (text) ====
Index: perl/ext/DB_File/Changes
--- perl/ext/DB_File/Changes.~1~ Sat Mar 2 07:00:05 2002
+++ perl/ext/DB_File/Changes Sat Mar 2 07:00:05 2002
@@ -395,10 +395,18 @@
* Added "clean" attribute to Makefile.PL
-1.802 6th January 2001
+1.802 6th January 2002
* The message about some test failing in db-recno.t had the wrong test
numbers. Fixed.
* merged core patch 13942.
+1.803 1st March 2002
+
+ * Fixed a problem with db-btree.t where it complained about an "our"
+ variable redeclaation.
+
+ * FETCH, STORE & DELETE don't map the flags parameter into the
+ equivalent Berkeley DB function anymore.
+
==== //depot/perl/ext/DB_File/DB_File.pm#39 (text) ====
Index: perl/ext/DB_File/DB_File.pm
--- perl/ext/DB_File/DB_File.pm.~1~ Sat Mar 2 07:00:05 2002
+++ perl/ext/DB_File/DB_File.pm Sat Mar 2 07:00:05 2002
@@ -1,8 +1,8 @@
# DB_File.pm -- Perl 5 interface to Berkeley DB
#
# written by Paul Marquess ([EMAIL PROTECTED])
-# last modified 6th Jan 2002
-# version 1.802
+# last modified 1st March 2002
+# version 1.803
#
# Copyright (c) 1995-2002 Paul Marquess. All rights reserved.
# This program is free software; you can redistribute it and/or
@@ -150,7 +150,7 @@
use Carp;
-$VERSION = "1.802" ;
+$VERSION = "1.803" ;
#typedef enum { DB_BTREE, DB_HASH, DB_RECNO } DBTYPE;
$DB_BTREE = new DB_File::BTREEINFO ;
@@ -978,7 +978,7 @@
use strict ;
use DB_File ;
- our ($filename, %h) ;
+ my ($filename, %h) ;
$filename = "tree" ;
unlink $filename ;
@@ -1033,7 +1033,7 @@
use strict ;
use DB_File ;
- our ($filename, $x, %h, $status, $key, $value) ;
+ my ($filename, $x, %h, $status, $key, $value) ;
$filename = "tree" ;
unlink $filename ;
@@ -1105,7 +1105,7 @@
use strict ;
use DB_File ;
- our ($filename, $x, %h) ;
+ my ($filename, $x, %h) ;
$filename = "tree" ;
@@ -1155,7 +1155,7 @@
use strict ;
use DB_File ;
- our ($filename, $x, %h, $found) ;
+ my ($filename, $x, %h, $found) ;
$filename = "tree" ;
@@ -1194,7 +1194,7 @@
use strict ;
use DB_File ;
- our ($filename, $x, %h, $found) ;
+ my ($filename, $x, %h, $found) ;
$filename = "tree" ;
@@ -1240,7 +1240,7 @@
use DB_File ;
use Fcntl ;
- our ($filename, $x, %h, $st, $key, $value) ;
+ my ($filename, $x, %h, $st, $key, $value) ;
sub match
{
@@ -1439,7 +1439,7 @@
use warnings ;
use strict ;
- our (@h, $H, $file, $i) ;
+ my (@h, $H, $file, $i) ;
use DB_File ;
use Fcntl ;
@@ -2004,7 +2004,7 @@
use DB_File ;
use Fcntl ;
- our ($dotdir, $HISTORY, %hist_db, $href, $binary_time, $date) ;
+ my ($dotdir, $HISTORY, %hist_db, $href, $binary_time, $date) ;
$dotdir = $ENV{HOME} || $ENV{LOGNAME};
$HISTORY = "$dotdir/.netscape/history.db";
==== //depot/perl/ext/DB_File/DB_File.xs#57 (text) ====
Index: perl/ext/DB_File/DB_File.xs
--- perl/ext/DB_File/DB_File.xs.~1~ Sat Mar 2 07:00:05 2002
+++ perl/ext/DB_File/DB_File.xs Sat Mar 2 07:00:05 2002
@@ -3,8 +3,8 @@
DB_File.xs -- Perl 5 interface to Berkeley DB
written by Paul Marquess <[EMAIL PROTECTED]>
- last modified 6th Jan 2002
- version 1.802
+ last modified 1st March 2002
+ version 1.803
All comments/suggestions/problems are welcome
@@ -99,6 +99,8 @@
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.
*/
@@ -123,8 +125,6 @@
# undef __attribute__
#endif
-
-
#ifdef COMPAT185
# include <db_185.h>
#else
@@ -327,9 +327,9 @@
-#define db_DELETE(db, key, flags) ((db->dbp)->del)(db->dbp, TXN &key, flags)
-#define db_STORE(db, key, value, flags) ((db->dbp)->put)(db->dbp, TXN &key, &value,
flags)
-#define db_FETCH(db, key, flags) ((db->dbp)->get)(db->dbp, TXN &key, &value,
flags)
+#define db_DELETE(db, key, flags) ((db->dbp)->del)(db->dbp, TXN &key, 0)
+#define db_STORE(db, key, value, flags) ((db->dbp)->put)(db->dbp, TXN &key, &value, 0)
+#define db_FETCH(db, key, flags) ((db->dbp)->get)(db->dbp, TXN &key, &value, 0)
#define db_sync(db, flags) ((db->dbp)->sync)(db->dbp, flags)
#define db_get(db, key, value, flags) ((db->dbp)->get)(db->dbp, TXN &key, &value,
flags)
==== //depot/perl/ext/DB_File/t/db-btree.t#10 (xtext) ====
Index: perl/ext/DB_File/t/db-btree.t
--- perl/ext/DB_File/t/db-btree.t.~1~ Sat Mar 2 07:00:05 2002
+++ perl/ext/DB_File/t/db-btree.t Sat Mar 2 07:00:05 2002
@@ -958,7 +958,7 @@
use strict ;
use DB_File ;
- our ($filename, %h);
+ my ($filename, %h);
$filename = "tree" ;
unlink $filename ;
@@ -1010,7 +1010,7 @@
use strict ;
use DB_File ;
- our ($filename, $x, %h, $status, $key, $value);
+ my ($filename, $x, %h, $status, $key, $value);
$filename = "tree" ;
unlink $filename ;
@@ -1066,7 +1066,7 @@
use strict ;
use DB_File ;
- our ($filename, $x, %h);
+ my ($filename, $x, %h);
$filename = "tree" ;
@@ -1115,7 +1115,7 @@
use strict ;
use DB_File ;
- our ($filename, $x, %h, $found);
+ my ($filename, $x, %h, $found);
$filename = "tree" ;
@@ -1150,7 +1150,7 @@
use strict ;
use DB_File ;
- our ($filename, $x, %h, $found);
+ my ($filename, $x, %h, $found);
$filename = "tree" ;
@@ -1186,7 +1186,7 @@
use DB_File ;
use Fcntl ;
- our ($filename, $x, %h, $st, $key, $value);
+ my ($filename, $x, %h, $st, $key, $value);
sub match
{
End of Patch.
