diff options
Diffstat (limited to 'ext/mysqli/mysqli_nonapi.c')
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 170 |
1 files changed, 66 insertions, 104 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index ff0476767a..c9f06551ab 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -56,8 +56,7 @@ static void php_mysqli_set_error(long mysql_errno, char *mysql_err TSRMLS_DC) } /* }}} */ - -void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_connect, zend_bool in_ctor) +void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_connect, zend_bool in_ctor) /* {{{ */ { MY_MYSQL *mysql = NULL; MYSQLI_RESOURCE *mysqli_resource = NULL; @@ -66,10 +65,9 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne int hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0; zend_bool persistent = FALSE; long port = 0, flags = 0; - uint hash_len; - char *hash_key = NULL; + zend_string *hash_key = NULL; zend_bool new_connection = FALSE; - zend_rsrc_list_entry *le; + zend_resource *le; mysqli_plist_entry *plist = NULL; zend_bool self_alloced = 0; @@ -95,7 +93,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne } if (object && instanceof_function(Z_OBJCE_P(object), mysqli_link_class_entry TSRMLS_CC)) { - mysqli_resource = ((mysqli_object *) zend_object_store_get_object(object TSRMLS_CC))->ptr; + mysqli_resource = (Z_MYSQLI_P(object))->ptr; if (mysqli_resource && mysqli_resource->ptr) { mysql = (MY_MYSQL*) mysqli_resource->ptr; } @@ -113,8 +111,8 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne return; } - mysqli_resource = ((mysqli_object *) zend_object_store_get_object(object TSRMLS_CC))->ptr; - MYSQLI_FETCH_RESOURCE_CONN(mysql, &object, MYSQLI_STATUS_INITIALIZED); + mysqli_resource = (Z_MYSQLI_P(object))->ptr; + MYSQLI_FETCH_RESOURCE_CONN(mysql, object, MYSQLI_STATUS_INITIALIZED); /* set some required options */ flags |= CLIENT_MULTI_RESULTS; /* needed for mysql_multi_query() */ @@ -156,15 +154,15 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne } else { mysql->persistent = persistent = TRUE; - hash_len = spprintf(&hash_key, 0, "mysqli_%s_%s%ld%s%s%s", SAFE_STR(hostname), SAFE_STR(socket), + hash_key = strpprintf(0, "mysqli_%s_%s%ld%s%s%s", SAFE_STR(hostname), SAFE_STR(socket), port, SAFE_STR(username), SAFE_STR(dbname), SAFE_STR(passwd)); mysql->hash_key = hash_key; /* check if we can reuse exisiting connection ... */ - if (zend_hash_find(&EG(persistent_list), hash_key, hash_len + 1, (void **)&le) == SUCCESS) { - if (Z_TYPE_P(le) == php_le_pmysqli()) { + if ((le = zend_hash_find_ptr(&EG(persistent_list), hash_key)) != NULL) { + if (le->type == php_le_pmysqli()) { plist = (mysqli_plist_entry *) le->ptr; do { @@ -192,12 +190,12 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne } while (0); } } else { - zend_rsrc_list_entry le; + zend_resource le; le.type = php_le_pmysqli(); le.ptr = plist = calloc(1, sizeof(mysqli_plist_entry)); zend_ptr_stack_init_ex(&plist->free_links, 1); - zend_hash_update(&EG(persistent_list), hash_key, hash_len + 1, (void *)&le, sizeof(le), NULL); + zend_hash_update_mem(&EG(persistent_list), hash_key, &le, sizeof(le)); } } } @@ -283,7 +281,7 @@ end: if (!object || !instanceof_function(Z_OBJCE_P(object), mysqli_link_class_entry TSRMLS_CC)) { MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_link_class_entry); } else { - ((mysqli_object *) zend_object_store_get_object(object TSRMLS_CC))->ptr = mysqli_resource; + (Z_MYSQLI_P(object))->ptr = mysqli_resource; } if (!is_real_connect) { return; @@ -293,7 +291,7 @@ end: err: if (mysql->hash_key) { - efree(mysql->hash_key); + STR_RELEASE(mysql->hash_key); mysql->hash_key = NULL; mysql->persistent = FALSE; } @@ -301,8 +299,7 @@ err: efree(mysql); } RETVAL_FALSE; -} - +} /* }}} */ /* {{{ proto object mysqli_connect([string hostname [,string username [,string passwd [,string dbname [,int port [,string socket]]]]]]) Open a connection to a mysql server */ @@ -312,7 +309,6 @@ PHP_FUNCTION(mysqli_connect) } /* }}} */ - /* {{{ proto object mysqli_link_construct() */ PHP_FUNCTION(mysqli_link_construct) @@ -321,7 +317,6 @@ PHP_FUNCTION(mysqli_link_construct) } /* }}} */ - /* {{{ proto int mysqli_connect_errno(void) Returns the numerical value of the error message from last connect command */ PHP_FUNCTION(mysqli_connect_errno) @@ -335,14 +330,13 @@ PHP_FUNCTION(mysqli_connect_errno) PHP_FUNCTION(mysqli_connect_error) { if (MyG(error_msg)) { - RETURN_STRING(MyG(error_msg),1); + RETURN_STRING(MyG(error_msg)); } else { RETURN_NULL(); } } /* }}} */ - /* {{{ proto mixed mysqli_fetch_array (object result [,int resulttype]) Fetch a result row as an associative array, a numeric array, or both */ PHP_FUNCTION(mysqli_fetch_array) @@ -359,7 +353,6 @@ PHP_FUNCTION(mysqli_fetch_assoc) } /* }}} */ - /* {{{ proto mixed mysqli_fetch_all (object result [,int resulttype]) Fetches all result rows as an associative array, a numeric array, or both */ #if defined(MYSQLI_USE_MYSQLND) @@ -384,8 +377,6 @@ PHP_FUNCTION(mysqli_fetch_all) } /* }}} */ - - /* {{{ proto array mysqli_get_client_stats(void) Returns statistics about the zval cache */ PHP_FUNCTION(mysqli_get_client_stats) @@ -397,7 +388,6 @@ PHP_FUNCTION(mysqli_get_client_stats) } /* }}} */ - /* {{{ proto array mysqli_get_connection_stats(void) Returns statistics about the zval cache */ PHP_FUNCTION(mysqli_get_connection_stats) @@ -426,7 +416,7 @@ PHP_FUNCTION(mysqli_error_list) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID); + MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); array_init(return_value); #if defined(MYSQLI_USE_MYSQLND) if (mysql->mysql->data->error_info->error_list) { @@ -436,30 +426,27 @@ PHP_FUNCTION(mysqli_error_list) message; message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_next_ex(mysql->mysql->data->error_info->error_list, &pos)) { - zval * single_error; - MAKE_STD_ZVAL(single_error); - array_init(single_error); - add_assoc_long_ex(single_error, "errno", sizeof("errno"), message->error_no); - add_assoc_string_ex(single_error, "sqlstate", sizeof("sqlstate"), message->sqlstate); - add_assoc_string_ex(single_error, "error", sizeof("error"), message->error); - add_next_index_zval(return_value, single_error); + zval single_error; + array_init(&single_error); + add_assoc_long_ex(&single_error, "errno", sizeof("errno") - 1, message->error_no); + add_assoc_string_ex(&single_error, "sqlstate", sizeof("sqlstate") - 1, message->sqlstate); + add_assoc_string_ex(&single_error, "error", sizeof("error") - 1, message->error); + add_next_index_zval(return_value, &single_error); } } #else if (mysql_errno(mysql->mysql)) { - zval * single_error; - MAKE_STD_ZVAL(single_error); - array_init(single_error); - add_assoc_long_ex(single_error, "errno", sizeof("errno"), mysql_errno(mysql->mysql)); - add_assoc_string_ex(single_error, "sqlstate", sizeof("sqlstate"), mysql_sqlstate(mysql->mysql)); - add_assoc_string_ex(single_error, "error", sizeof("error"), mysql_error(mysql->mysql)); - add_next_index_zval(return_value, single_error); + zval single_error; + array_init(&single_error); + add_assoc_long_ex(&single_error, "errno", sizeof("errno") - 1, mysql_errno(mysql->mysql)); + add_assoc_string_ex(&single_error, "sqlstate", sizeof("sqlstate") - 1, mysql_sqlstate(mysql->mysql)); + add_assoc_string_ex(&single_error, "error", sizeof("error") - 1, mysql_error(mysql->mysql)); + add_next_index_zval(return_value, &single_error); } #endif } /* }}} */ - /* {{{ proto string mysqli_stmt_error_list(object stmt) */ PHP_FUNCTION(mysqli_stmt_error_list) @@ -470,7 +457,7 @@ PHP_FUNCTION(mysqli_stmt_error_list) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE_STMT(stmt, &mysql_stmt, MYSQLI_STATUS_INITIALIZED); + MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_INITIALIZED); array_init(return_value); #if defined(MYSQLI_USE_MYSQLND) if (stmt->stmt && stmt->stmt->data && stmt->stmt->data->error_info->error_list) { @@ -480,30 +467,27 @@ PHP_FUNCTION(mysqli_stmt_error_list) message; message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_next_ex(stmt->stmt->data->error_info->error_list, &pos)) { - zval * single_error; - MAKE_STD_ZVAL(single_error); - array_init(single_error); - add_assoc_long_ex(single_error, "errno", sizeof("errno"), message->error_no); - add_assoc_string_ex(single_error, "sqlstate", sizeof("sqlstate"), message->sqlstate); - add_assoc_string_ex(single_error, "error", sizeof("error"), message->error); - add_next_index_zval(return_value, single_error); + zval single_error; + array_init(&single_error); + add_assoc_long_ex(&single_error, "errno", sizeof("errno") - 1, message->error_no); + add_assoc_string_ex(&single_error, "sqlstate", sizeof("sqlstate") - 1, message->sqlstate); + add_assoc_string_ex(&single_error, "error", sizeof("error") - 1, message->error); + add_next_index_zval(return_value, &single_error); } } #else if (mysql_stmt_errno(stmt->stmt)) { - zval * single_error; - MAKE_STD_ZVAL(single_error); - array_init(single_error); - add_assoc_long_ex(single_error, "errno", sizeof("errno"), mysql_stmt_errno(stmt->stmt)); - add_assoc_string_ex(single_error, "sqlstate", sizeof("sqlstate"), mysql_stmt_sqlstate(stmt->stmt)); - add_assoc_string_ex(single_error, "error", sizeof("error"), mysql_stmt_error(stmt->stmt)); - add_next_index_zval(return_value, single_error); + zval single_error; + array_init(&single_error); + add_assoc_long_ex(&single_error, "errno", sizeof("errno") - 1, mysql_stmt_errno(stmt->stmt)); + add_assoc_string_ex(&single_error, "sqlstate", sizeof("sqlstate") - 1, mysql_stmt_sqlstate(stmt->stmt)); + add_assoc_string_ex(&single_error, "error", sizeof("error") - 1, mysql_stmt_error(stmt->stmt)); + add_next_index_zval(return_value, &single_error); } #endif } /* }}} */ - /* {{{ proto mixed mysqli_fetch_object (object result [, string class_name [, NULL|array ctor_params]]) Fetch a result row as an object */ PHP_FUNCTION(mysqli_fetch_object) @@ -524,7 +508,7 @@ PHP_FUNCTION(mysqli_multi_query) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID); + MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); MYSQLI_ENABLE_MQ; if (mysql_real_query(mysql->mysql, query, query_len)) { @@ -584,7 +568,7 @@ PHP_FUNCTION(mysqli_query) RETURN_FALSE; } - MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID); + MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); MYSQLI_DISABLE_MQ; @@ -647,7 +631,6 @@ PHP_FUNCTION(mysqli_query) } /* }}} */ - #if defined(MYSQLI_USE_MYSQLND) #include "php_network.h" /* {{{ mysqlnd_zval_array_to_mysqlnd_array functions */ @@ -687,7 +670,6 @@ static int mysqlnd_zval_array_to_mysqlnd_array(zval *in_array, MYSQLND ***out_ar } /* }}} */ - /* {{{ mysqlnd_zval_array_from_mysqlnd_array */ static int mysqlnd_zval_array_from_mysqlnd_array(MYSQLND **in_array, zval *out_array TSRMLS_DC) { @@ -738,48 +720,38 @@ static int mysqlnd_zval_array_from_mysqlnd_array(MYSQLND **in_array, zval *out_a } /* }}} */ - /* {{{ mysqlnd_dont_poll_zval_array_from_mysqlnd_array */ static int mysqlnd_dont_poll_zval_array_from_mysqlnd_array(MYSQLND **in_array, zval *in_zval_array, zval *out_array TSRMLS_DC) { MYSQLND **p = in_array; - HashTable *new_hash; - zval **elem, **dest_elem; + zval proxy, *elem, *dest_elem; int ret = 0; - ALLOC_HASHTABLE(new_hash); - zend_hash_init(new_hash, in_zval_array? zend_hash_num_elements(Z_ARRVAL_P(in_zval_array)):0, NULL, ZVAL_PTR_DTOR, 0); + array_init(&proxy); if (in_array) { - for (zend_hash_internal_pointer_reset(Z_ARRVAL_P(in_zval_array)); - zend_hash_get_current_data(Z_ARRVAL_P(in_zval_array), (void **) &elem) == SUCCESS; - zend_hash_move_forward(Z_ARRVAL_P(in_zval_array))) - { + ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(in_zval_array), elem) { MY_MYSQL *mysql; - mysqli_object *intern = (mysqli_object *)zend_object_store_get_object(*elem TSRMLS_CC); - mysql = (MY_MYSQL *) ((MYSQLI_RESOURCE *)intern->ptr)->ptr; + mysqli_object *intern = Z_MYSQLI_P(elem); + mysql = (MY_MYSQL *)((MYSQLI_RESOURCE *)intern->ptr)->ptr; if (mysql->mysql == *p) { - zend_hash_next_index_insert(new_hash, (void *)elem, sizeof(zval *), (void **)&dest_elem); + dest_elem = zend_hash_next_index_insert(Z_ARRAY(proxy), elem); if (dest_elem) { zval_add_ref(dest_elem); } ret++; p++; } - } + } ZEND_HASH_FOREACH_END(); } /* destroy old array and add new one */ - zend_hash_destroy(Z_ARRVAL_P(out_array)); - efree(Z_ARRVAL_P(out_array)); - - zend_hash_internal_pointer_reset(new_hash); - Z_ARRVAL_P(out_array) = new_hash; + zval_ptr_dtor(out_array); + ZVAL_COPY_VALUE(out_array, &proxy); return 0; } /* }}} */ - /* {{{ proto int mysqli_poll(array read, array write, array error, long sec [, long usec]) U Poll connections */ PHP_FUNCTION(mysqli_poll) @@ -838,7 +810,6 @@ PHP_FUNCTION(mysqli_poll) } /* }}} */ - /* {{{ proto int mysqli_reap_async_query(object link) U Poll connections */ PHP_FUNCTION(mysqli_reap_async_query) @@ -852,7 +823,7 @@ PHP_FUNCTION(mysqli_reap_async_query) return; } - MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID); + MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); if (FAIL == mysqlnd_reap_async_query(mysql->mysql)) { RETURN_FALSE; @@ -892,7 +863,6 @@ PHP_FUNCTION(mysqli_reap_async_query) } /* }}} */ - /* {{{ proto object mysqli_stmt_get_result(object link) U Buffer result set on client */ PHP_FUNCTION(mysqli_stmt_get_result) @@ -905,7 +875,7 @@ PHP_FUNCTION(mysqli_stmt_get_result) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE_STMT(stmt, &mysql_stmt, MYSQLI_STATUS_VALID); + MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID); if (!(result = mysqlnd_stmt_get_result(stmt->stmt))) { MYSQLI_REPORT_STMT_ERROR(stmt->stmt); @@ -920,7 +890,6 @@ PHP_FUNCTION(mysqli_stmt_get_result) /* }}} */ #endif - /* {{{ proto object mysqli_get_warnings(object link) */ PHP_FUNCTION(mysqli_get_warnings) { @@ -932,7 +901,7 @@ PHP_FUNCTION(mysqli_get_warnings) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID); + MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); if (mysql_warning_count(mysql->mysql)) { #ifdef MYSQLI_USE_MYSQLND @@ -950,7 +919,6 @@ PHP_FUNCTION(mysqli_get_warnings) } /* }}} */ - /* {{{ proto object mysqli_stmt_get_warnings(object link) */ PHP_FUNCTION(mysqli_stmt_get_warnings) { @@ -962,7 +930,7 @@ PHP_FUNCTION(mysqli_stmt_get_warnings) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &stmt_link, mysqli_stmt_class_entry) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE_STMT(stmt, &stmt_link, MYSQLI_STATUS_VALID); + MYSQLI_FETCH_RESOURCE_STMT(stmt, stmt_link, MYSQLI_STATUS_VALID); if (mysqli_stmt_warning_count(stmt->stmt)) { w = php_get_warnings(mysqli_stmt_get_connection(stmt->stmt) TSRMLS_CC); @@ -976,7 +944,6 @@ PHP_FUNCTION(mysqli_stmt_get_warnings) } /* }}} */ - #ifdef HAVE_MYSQLI_SET_CHARSET /* {{{ proto bool mysqli_set_charset(object link, string csname) sets client character set */ @@ -990,7 +957,7 @@ PHP_FUNCTION(mysqli_set_charset) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &cs_name, &csname_len) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID); + MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); if (mysql_set_character_set(mysql->mysql, cs_name)) { RETURN_FALSE; @@ -1018,7 +985,7 @@ PHP_FUNCTION(mysqli_get_charset) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID); + MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); #if !defined(MYSQLI_USE_MYSQLND) @@ -1067,9 +1034,9 @@ static int mysqli_begin_transaction_libmysql(MYSQL * conn, const unsigned int mo { int ret; zend_bool err = FALSE; - smart_str tmp_str = {0, 0, 0}; + smart_str tmp_str = {0}; if (mode & TRANS_START_WITH_CONSISTENT_SNAPSHOT) { - if (tmp_str.len) { + if (tmp_str.s) { smart_str_appendl(&tmp_str, ", ", sizeof(", ") - 1); } smart_str_appendl(&tmp_str, "WITH CONSISTENT SNAPSHOT", sizeof("WITH CONSISTENT SNAPSHOT") - 1); @@ -1079,12 +1046,12 @@ static int mysqli_begin_transaction_libmysql(MYSQL * conn, const unsigned int mo php_error_docref(NULL TSRMLS_CC, E_WARNING, "This server version doesn't support 'READ WRITE' and 'READ ONLY'. Minimum 5.6.5 is required"); err = TRUE; } else if (mode & TRANS_START_READ_WRITE) { - if (tmp_str.len) { + if (tmp_str.s) { smart_str_appendl(&tmp_str, ", ", sizeof(", ") - 1); } smart_str_appendl(&tmp_str, "READ WRITE", sizeof("READ WRITE") - 1); } else if (mode & TRANS_START_READ_ONLY) { - if (tmp_str.len) { + if (tmp_str.s) { smart_str_appendl(&tmp_str, ", ", sizeof(", ") - 1); } smart_str_appendl(&tmp_str, "READ ONLY", sizeof("READ ONLY") - 1); @@ -1096,7 +1063,7 @@ static int mysqli_begin_transaction_libmysql(MYSQL * conn, const unsigned int mo char * name_esc = mysqli_escape_string_for_tx_name_in_comment(name TSRMLS_CC); char * query; unsigned int query_len = spprintf(&query, 0, "START TRANSACTION%s %s", - name_esc? name_esc:"", tmp_str.c? tmp_str.c:""); + name_esc? name_esc:"", tmp_str.s? tmp_str.s->val:""); smart_str_free(&tmp_str); if (name_esc) { @@ -1125,7 +1092,7 @@ PHP_FUNCTION(mysqli_begin_transaction) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|ls", &mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID); + MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); if (flags < 0) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value for parameter flags (%ld)", flags); err = TRUE; @@ -1151,7 +1118,6 @@ PHP_FUNCTION(mysqli_begin_transaction) } /* }}} */ - #if !defined(MYSQLI_USE_MYSQLND) /* {{{ proto bool mysqli_savepoint_libmysql */ static int mysqli_savepoint_libmysql(MYSQL * conn, const char * const name, zend_bool release) @@ -1166,7 +1132,6 @@ static int mysqli_savepoint_libmysql(MYSQL * conn, const char * const name, zend /* }}} */ #endif - /* {{{ proto bool mysqli_savepoint(object link, string name) Starts a transaction */ PHP_FUNCTION(mysqli_savepoint) @@ -1179,7 +1144,7 @@ PHP_FUNCTION(mysqli_savepoint) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &name, &name_len) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID); + MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); if (!name || !name_len) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Savepoint name cannot be empty"); RETURN_FALSE; @@ -1196,7 +1161,6 @@ PHP_FUNCTION(mysqli_savepoint) } /* }}} */ - /* {{{ proto bool mysqli_release_savepoint(object link, string name) Starts a transaction */ PHP_FUNCTION(mysqli_release_savepoint) @@ -1209,7 +1173,7 @@ PHP_FUNCTION(mysqli_release_savepoint) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &name, &name_len) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE_CONN(mysql, &mysql_link, MYSQLI_STATUS_VALID); + MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); if (!name || !name_len) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Savepoint name cannot be empty"); RETURN_FALSE; @@ -1225,7 +1189,6 @@ PHP_FUNCTION(mysqli_release_savepoint) } /* }}} */ - /* {{{ proto bool mysqli_get_links_stats() Returns information about open and cached links */ PHP_FUNCTION(mysqli_get_links_stats) @@ -1242,7 +1205,6 @@ PHP_FUNCTION(mysqli_get_links_stats) /* }}} */ - /* * Local variables: * tab-width: 4 |