Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- sqlanywhere.c.orig 2012-07-05 12:41:25.895562111 +0300
- +++ sqlanywhere.c 2012-07-05 12:56:58.913548583 +0300
- @@ -1075,13 +1075,13 @@
- if( persistent ||
- hashed_details_length == strlen( sasql_HASH_STR ) + 1 ) {
- - list_entry * le = NULL;
- + zend_rsrc_list_entry * le = NULL;
- /* 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;
- if( SAG(max_conns) != -1 &&
- SAG(num_conns) >= SAG(max_conns)) {
- @@ -1141,7 +1141,7 @@
- new_le.ptr = sqlany_conn;
- if( zend_hash_update(&EG(persistent_list), hashed_details,
- hashed_details_length+1, (void *) &new_le,
- - sizeof(list_entry),NULL)==FAILURE) {
- + sizeof(zend_rsrc_list_entry),NULL)==FAILURE) {
- api.sqlany_disconnect( sqlany_conn->handle );
- api.sqlany_free_connection( sqlany_conn->handle );
- efree( hashed_details );
- @@ -1171,7 +1171,7 @@
- sqlany_conn->id = zend_list_insert(sqlany_conn, le_pconn);
- } else {
- /* ! persistent */
- - list_entry * index_ptr, new_index_ptr;
- + zend_rsrc_list_entry * index_ptr, new_index_ptr;
- if (zend_hash_find(&EG(regular_list),hashed_details,hashed_details_length+1,
- (void **) &index_ptr)==SUCCESS) {
- int type;
- @@ -1240,7 +1240,7 @@
- new_index_ptr.ptr = (void *) Z_LVAL_P( return_value );
- new_index_ptr.type = 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) {
- + (void *) &new_index_ptr, sizeof(zend_rsrc_list_entry),NULL)==FAILURE) {
- efree(hashed_details);
- api.sqlany_disconnect( sqlany_conn->handle );
- api.sqlany_free_connection( sqlany_conn->handle );
- @@ -1270,8 +1270,8 @@
- void *sqlca;
- sqlany_connection_t * sqlany_conn;
- char * hashed_details = sasql_HASH_STR;
- - list_entry new_le;
- - list_entry * le = NULL;
- + zend_rsrc_list_entry new_le;
- + zend_rsrc_list_entry * le = NULL;
- if( !api.initialized ) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, DBCAPI_NOT_FOUND_ERROR );
- @@ -1332,7 +1332,7 @@
- new_le.ptr = sqlany_conn;
- if( zend_hash_update( &EG( persistent_list ), hashed_details,
- strlen( hashed_details ) + 1, (void *) &new_le,
- - sizeof( list_entry ), NULL ) == FAILURE ) {
- + sizeof( zend_rsrc_list_entry ), NULL ) == FAILURE ) {
- /* we don't want to close the connection because it
- * belongs to someone else */
- api.sqlany_free_connection( sqlany_conn->handle );
- @@ -1357,7 +1357,7 @@
- {
- zval ** arg;
- sqlany_connection_t * sqlany_conn;
- - list_entry * le;
- + zend_rsrc_list_entry * le;
- if( ( ZEND_NUM_ARGS() != 1) || (zend_get_parameters_array_ex(1,&arg) != SUCCESS )) {
- WRONG_PARAM_COUNT;
- @@ -2169,7 +2169,7 @@
- Z_ADDREF_P( tmp );
- zend_hash_index_update( Z_ARRVAL_P(return_value),
- i,
- - (void *)&tmp, sizeof(pval*), NULL );
- + (void *)&tmp, sizeof(zval*), NULL );
- }
- if( result_type & FETCH_OBJ ) {
- a_sqlany_column_info cinfo;
- @@ -2180,7 +2180,7 @@
- zend_hash_update( Z_ARRVAL_P(return_value),
- cinfo.name,
- strlen( cinfo.name ) + 1,
- - (void *)&tmp, sizeof(pval*), NULL );
- + (void *)&tmp, sizeof(zval*), NULL );
- }
- }
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement