From: Marcus Boerger <helly@php.net>
Date: Mon, 30 Dec 2002 11:32:37 +0000 (+0000)
Subject: -better parameter names for DBA_HND macros
X-Git-Tag: PHP_5_0_dev_before_13561_fix~573
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4b9e8fc899adbf11440d565bc96497a0020c81f2;p=php

-better parameter names for DBA_HND macros
-remove unnecessary notice
---

diff --git a/ext/dba/dba.c b/ext/dba/dba.c
index becac43404..38c736cde3 100644
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@@ -159,14 +159,14 @@ typedef struct dba_handler {
 
 /* 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 @@ static void php_dba_open(INTERNAL_FUNCTION_PARAMETERS, int persistent)
 		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;