helly Mon Dec 30 06:32:37 2002 EDT
Modified files:
/php4/ext/dba dba.c
Log:
-better parameter names for DBA_HND macros
-remove unnecessary notice
Index: php4/ext/dba/dba.c
diff -u php4/ext/dba/dba.c:1.75 php4/ext/dba/dba.c:1.76
--- php4/ext/dba/dba.c:1.75 Sun Dec 29 10:31:00 2002
+++ php4/ext/dba/dba.c Mon Dec 30 06:32:37 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba.c,v 1.75 2002/12/29 15:31:00 helly Exp $ */
+/* $Id: dba.c,v 1.76 2002/12/30 11:32:37 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -159,14 +159,14 @@
/* a DBA handler must have specific routines */
-#define DBA_NAMED_HND(name, x, flags) \
+#define DBA_NAMED_HND(alias, name, flags) \
{\
#name, flags, dba_open_##x, dba_close_##x, dba_fetch_##x, dba_update_##x, \
dba_exists_##x, dba_delete_##x, dba_firstkey_##x, dba_nextkey_##x, \
dba_optimize_##x, dba_sync_##x \
},
-#define DBA_HND(x, flags) DBA_NAMED_HND(x, x, flags)
+#define DBA_HND(name, flags) DBA_NAMED_HND(name, name, flags)
/* check whether the user has write access */
#define DBA_WRITE_CHECK \
@@ -513,6 +513,10 @@
switch (pmode[1]) {
case 'd':
lock_dbf = 1;
+ if ((hptr->flags & DBA_LOCK_ALL) == 0) {
+ lock_flag = (hptr->flags & DBA_LOCK_ALL);
+ break;
+ }
/* no break */
case 'l':
lock_flag = DBA_LOCK_ALL;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
