sniper Mon Dec 5 17:43:14 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/dba dba.c
Log:
MFH:- Do not use the PHP3 era names
http://cvs.php.net/diff.php/php-src/ext/dba/dba.c?r1=1.111&r2=1.111.2.1&ty=u
Index: php-src/ext/dba/dba.c
diff -u php-src/ext/dba/dba.c:1.111 php-src/ext/dba/dba.c:1.111.2.1
--- php-src/ext/dba/dba.c:1.111 Wed Aug 3 10:06:53 2005
+++ php-src/ext/dba/dba.c Mon Dec 5 17:43:14 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: dba.c,v 1.111 2005/08/03 14:06:53 sniper Exp $ */
+/* $Id: dba.c,v 1.111.2.1 2005/12/05 22:43:14 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -365,7 +365,7 @@
/* }}} */
/* {{{ dba_close_pe_rsrc_deleter */
-int dba_close_pe_rsrc_deleter(list_entry *le, void *pDba TSRMLS_DC)
+int dba_close_pe_rsrc_deleter(zend_rsrc_list_entry *le, void *pDba TSRMLS_DC)
{
return le->ptr == pDba;
}
@@ -502,7 +502,7 @@
*/
dba_info *php_dba_find(const char* path TSRMLS_DC)
{
- list_entry *le;
+ zend_rsrc_list_entry *le;
dba_info *info;
int numitems, i;
@@ -559,7 +559,7 @@
}
if (persistent) {
- list_entry *le;
+ zend_rsrc_list_entry *le;
/* calculate hash */
key = safe_emalloc(keylen, 1, 1);
@@ -845,11 +845,11 @@
info->argv = NULL;
if (persistent) {
- list_entry new_le;
+ zend_rsrc_list_entry new_le;
Z_TYPE(new_le) = le_pdb;
new_le.ptr = info;
- if (zend_hash_update(&EG(persistent_list), key, keylen+1,
&new_le, sizeof(list_entry), NULL) == FAILURE) {
+ if (zend_hash_update(&EG(persistent_list), key, keylen+1,
&new_le, sizeof(zend_rsrc_list_entry), NULL) == FAILURE) {
dba_close(info TSRMLS_CC);
php_error_docref2(NULL TSRMLS_CC, Z_STRVAL_PP(args[0]),
Z_STRVAL_PP(args[1]), E_WARNING, "Could not register persistent resource");
FREENOW;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
