summaryrefslogtreecommitdiff
path: root/ext/msql/php_msql.c
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2005-12-05 23:31:09 +0000
committerfoobar <sniper@php.net>2005-12-05 23:31:09 +0000
commit34ad5ab731c7f281c49be8c77ed81b50ec226eab (patch)
tree3ea9c5660a0a2b2aabb0e888e8355b414ecca6fb /ext/msql/php_msql.c
parent0ac2b74b0be70d651383a5c948a2fe2a1f1b3cea (diff)
downloadphp-git-34ad5ab731c7f281c49be8c77ed81b50ec226eab.tar.gz
- list_entry -> zend_rsrc_list_entry
Diffstat (limited to 'ext/msql/php_msql.c')
-rw-r--r--ext/msql/php_msql.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/msql/php_msql.c b/ext/msql/php_msql.c
index 905c721ec3..cc7454f550 100644
--- a/ext/msql/php_msql.c
+++ b/ext/msql/php_msql.c
@@ -264,7 +264,7 @@ static void php_msql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
persistent=0;
}
if (persistent) {
- list_entry *le;
+ zend_rsrc_list_entry *le;
if (msql_globals.max_links!=-1 && msql_globals.num_links>=msql_globals.max_links) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%d)", msql_globals.num_links);
@@ -279,7 +279,7 @@ static void php_msql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
/* try to find if we already have this link in our persistent list */
if (zend_hash_find(&EG(persistent_list), hashed_details, hashed_details_length+1, (void **) &le)==FAILURE) { /* we don't */
- list_entry new_le;
+ zend_rsrc_list_entry new_le;
/* create the link */
if ((msql=msqlConnect(host))==-1) {
@@ -290,7 +290,7 @@ static void php_msql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
/* hash it up */
Z_TYPE(new_le) = msql_globals.le_plink;
new_le.ptr = (void *) msql;
- if (zend_hash_update(&EG(persistent_list), hashed_details, hashed_details_length+1, (void *) &new_le, sizeof(list_entry), NULL)==FAILURE) {
+ if (zend_hash_update(&EG(persistent_list), hashed_details, hashed_details_length+1, (void *) &new_le, sizeof(zend_rsrc_list_entry), NULL)==FAILURE) {
efree(hashed_details);
RETURN_FALSE;
}
@@ -317,7 +317,7 @@ static void php_msql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
}
ZEND_REGISTER_RESOURCE(return_value, (void *) msql, msql_globals.le_plink);
} else {
- list_entry *index_ptr,new_index_ptr;
+ zend_rsrc_list_entry *index_ptr,new_index_ptr;
/* first we check the hash for the hashed_details key. if it exists,
* it should point us to the right offset where the actual msql link sits.
@@ -358,7 +358,7 @@ static void php_msql_do_connect(INTERNAL_FUNCTION_PARAMETERS,int persistent)
/* add it to the hash */
new_index_ptr.ptr = (void *) Z_LVAL_P(return_value);
Z_TYPE(new_index_ptr) = le_index_ptr;
- if (zend_hash_update(&EG(regular_list),hashed_details,hashed_details_length+1,(void *) &new_index_ptr, sizeof(list_entry), NULL)==FAILURE) {
+ if (zend_hash_update(&EG(regular_list),hashed_details,hashed_details_length+1,(void *) &new_index_ptr, sizeof(zend_rsrc_list_entry), NULL)==FAILURE) {
efree(hashed_details);
RETURN_FALSE;
}