diff options
Diffstat (limited to 'ext/mysqli/mysqli_nonapi.c')
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 140 |
1 files changed, 70 insertions, 70 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index db0d0ee677..32bdcdfa69 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -37,12 +37,12 @@ #ifndef zend_parse_parameters_none #define zend_parse_parameters_none() \ - zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") + zend_parse_parameters(ZEND_NUM_ARGS(), "") #endif /* {{{ php_mysqli_set_error */ -static void php_mysqli_set_error(zend_long mysql_errno, char *mysql_err TSRMLS_DC) +static void php_mysqli_set_error(zend_long mysql_errno, char *mysql_err) { MyG(error_no) = mysql_errno; if (MyG(error_msg)) { @@ -74,7 +74,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne #if !defined(MYSQL_USE_MYSQLND) if ((MYSQL_VERSION_ID / 100) != (mysql_get_client_version() / 100)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Headers and client library minor version mismatch. Headers:%d Library:%ld", MYSQL_VERSION_ID, mysql_get_client_version()); } @@ -87,12 +87,12 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne hostname = username = dbname = passwd = socket = NULL; if (!is_real_connect) { - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ssssls", &hostname, &hostname_len, &username, &username_len, + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ssssls", &hostname, &hostname_len, &username, &username_len, &passwd, &passwd_len, &dbname, &dbname_len, &port, &socket, &socket_len) == FAILURE) { return; } - if (object && instanceof_function(Z_OBJCE_P(object), mysqli_link_class_entry TSRMLS_CC)) { + if (object && instanceof_function(Z_OBJCE_P(object), mysqli_link_class_entry)) { mysqli_resource = (Z_MYSQLI_P(object))->ptr; if (mysqli_resource && mysqli_resource->ptr) { mysql = (MY_MYSQL*) mysqli_resource->ptr; @@ -105,7 +105,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne flags |= CLIENT_MULTI_RESULTS; /* needed for mysql_multi_query() */ } else { /* We have flags too */ - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|sssslsl", &object, mysqli_link_class_entry, + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|sssslsl", &object, mysqli_link_class_entry, &hostname, &hostname_len, &username, &username_len, &passwd, &passwd_len, &dbname, &dbname_len, &port, &socket, &socket_len, &flags) == FAILURE) { return; @@ -144,13 +144,13 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne (mysqli_resource->status > MYSQLI_STATUS_INITIALIZED)) { /* already connected, we should close the connection */ - php_mysqli_close(mysql, MYSQLI_CLOSE_IMPLICIT, mysqli_resource->status TSRMLS_CC); + php_mysqli_close(mysql, MYSQLI_CLOSE_IMPLICIT, mysqli_resource->status); } if (strlen(SAFE_STR(hostname)) > 2 && !strncasecmp(hostname, "p:", 2)) { hostname += 2; if (!MyG(allow_persistent)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Persistent connections are disabled. Downgrading to normal"); + php_error_docref(NULL, E_WARNING, "Persistent connections are disabled. Downgrading to normal"); } else { mysql->persistent = persistent = TRUE; @@ -200,14 +200,14 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne } } if (MyG(max_links) != -1 && MyG(num_links) >= MyG(max_links)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%pd)", MyG(num_links)); + php_error_docref(NULL, E_WARNING, "Too many open links (%pd)", MyG(num_links)); goto err; } if (persistent && MyG(max_persistent) != -1 && (MyG(num_active_persistent) + MyG(num_inactive_persistent))>= MyG(max_persistent)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open persistent links (%pd)", + php_error_docref(NULL, E_WARNING, "Too many open persistent links (%pd)", MyG(num_active_persistent) + MyG(num_inactive_persistent)); goto err; } @@ -238,12 +238,12 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne if (mysql_real_connect(mysql->mysql, hostname, username, passwd, dbname, port, socket, flags) == NULL) #else if (mysqlnd_connect(mysql->mysql, hostname, username, passwd, passwd_len, dbname, dbname_len, - port, socket, flags, MYSQLND_CLIENT_KNOWS_RSET_COPY_DATA TSRMLS_CC) == NULL) + port, socket, flags, MYSQLND_CLIENT_KNOWS_RSET_COPY_DATA) == NULL) #endif { /* Save error messages - for mysqli_connect_error() & mysqli_connect_errno() */ - php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql) TSRMLS_CC); - php_mysqli_throw_sql_exception((char *)mysql_sqlstate(mysql->mysql), mysql_errno(mysql->mysql) TSRMLS_CC, + php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql)); + php_mysqli_throw_sql_exception((char *)mysql_sqlstate(mysql->mysql), mysql_errno(mysql->mysql), "%s", mysql_error(mysql->mysql)); if (!is_real_connect) { /* free mysql structure */ @@ -254,7 +254,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne } /* clear error */ - php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql) TSRMLS_CC); + php_mysqli_set_error(mysql_errno(mysql->mysql), (char *) mysql_error(mysql->mysql)); #if !defined(MYSQLI_USE_MYSQLND) mysql->mysql->reconnect = MyG(reconnect); @@ -278,7 +278,7 @@ end: mysql->multi_query = 0; - if (!object || !instanceof_function(Z_OBJCE_P(object), mysqli_link_class_entry TSRMLS_CC)) { + if (!object || !instanceof_function(Z_OBJCE_P(object), mysqli_link_class_entry)) { MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_link_class_entry); } else { (Z_MYSQLI_P(object))->ptr = mysqli_resource; @@ -362,13 +362,13 @@ PHP_FUNCTION(mysqli_fetch_all) zval *mysql_result; zend_long mode = MYSQLND_FETCH_NUM; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|l", &mysql_result, mysqli_result_class_entry, &mode) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|l", &mysql_result, mysqli_result_class_entry, &mode) == FAILURE) { return; } MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID); if (!mode || (mode & ~MYSQLND_FETCH_BOTH)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Mode can be only MYSQLI_FETCH_NUM, " + php_error_docref(NULL, E_WARNING, "Mode can be only MYSQLI_FETCH_NUM, " "MYSQLI_FETCH_ASSOC or MYSQLI_FETCH_BOTH"); RETURN_FALSE; } @@ -395,7 +395,7 @@ PHP_FUNCTION(mysqli_get_connection_stats) MY_MYSQL *mysql; zval *mysql_link; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { return; } @@ -413,7 +413,7 @@ PHP_FUNCTION(mysqli_error_list) MY_MYSQL *mysql; zval *mysql_link; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { return; } MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); @@ -454,7 +454,7 @@ PHP_FUNCTION(mysqli_stmt_error_list) MY_STMT *stmt; zval *mysql_stmt; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) { return; } MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_INITIALIZED); @@ -505,7 +505,7 @@ PHP_FUNCTION(mysqli_multi_query) char *query = NULL; size_t query_len; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) { return; } MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); @@ -551,12 +551,12 @@ PHP_FUNCTION(mysqli_query) size_t query_len; zend_long resultmode = MYSQLI_STORE_RESULT; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os|l", &mysql_link, mysqli_link_class_entry, &query, &query_len, &resultmode) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os|l", &mysql_link, mysqli_link_class_entry, &query, &query_len, &resultmode) == FAILURE) { return; } if (!query_len) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty query"); + php_error_docref(NULL, E_WARNING, "Empty query"); RETURN_FALSE; } #ifdef MYSQLI_USE_MYSQLND @@ -564,7 +564,7 @@ PHP_FUNCTION(mysqli_query) #else if ((resultmode & ~MYSQLI_ASYNC) != MYSQLI_USE_RESULT && (resultmode & ~MYSQLI_ASYNC) != MYSQLI_STORE_RESULT) { #endif - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value for resultmode"); + php_error_docref(NULL, E_WARNING, "Invalid value for resultmode"); RETURN_FALSE; } @@ -592,7 +592,7 @@ PHP_FUNCTION(mysqli_query) if (!mysql_field_count(mysql->mysql)) { /* no result set - not a SELECT */ if (MyG(report_mode) & MYSQLI_REPORT_INDEX) { - php_mysqli_report_index(query, mysqli_server_status(mysql->mysql) TSRMLS_CC); + php_mysqli_report_index(query, mysqli_server_status(mysql->mysql)); } RETURN_TRUE; } @@ -615,13 +615,13 @@ PHP_FUNCTION(mysqli_query) break; } if (!result) { - php_mysqli_throw_sql_exception((char *)mysql_sqlstate(mysql->mysql), mysql_errno(mysql->mysql) TSRMLS_CC, + php_mysqli_throw_sql_exception((char *)mysql_sqlstate(mysql->mysql), mysql_errno(mysql->mysql), "%s", mysql_error(mysql->mysql)); RETURN_FALSE; } if (MyG(report_mode) & MYSQLI_REPORT_INDEX) { - php_mysqli_report_index(query, mysqli_server_status(mysql->mysql) TSRMLS_CC); + php_mysqli_report_index(query, mysqli_server_status(mysql->mysql)); } mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE)); @@ -634,7 +634,7 @@ PHP_FUNCTION(mysqli_query) #if defined(MYSQLI_USE_MYSQLND) #include "php_network.h" /* {{{ mysqlnd_zval_array_to_mysqlnd_array functions */ -static int mysqlnd_zval_array_to_mysqlnd_array(zval *in_array, MYSQLND ***out_array TSRMLS_DC) +static int mysqlnd_zval_array_to_mysqlnd_array(zval *in_array, MYSQLND ***out_array) { zval *elem; int i = 0, current = 0; @@ -646,19 +646,19 @@ static int mysqlnd_zval_array_to_mysqlnd_array(zval *in_array, MYSQLND ***out_ar ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(in_array), elem) { i++; if (Z_TYPE_P(elem) != IS_OBJECT || - !instanceof_function(Z_OBJCE_P(elem), mysqli_link_class_entry TSRMLS_CC)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parameter %d not a mysqli object", i); + !instanceof_function(Z_OBJCE_P(elem), mysqli_link_class_entry)) { + php_error_docref(NULL, E_WARNING, "Parameter %d not a mysqli object", i); } else { MY_MYSQL *mysql; MYSQLI_RESOURCE *my_res; mysqli_object *intern = Z_MYSQLI_P(elem); if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "[%d] Couldn't fetch %s", i, intern->zo.ce->name->val); + php_error_docref(NULL, E_WARNING, "[%d] Couldn't fetch %s", i, intern->zo.ce->name->val); continue; } mysql = (MY_MYSQL*) my_res->ptr; if (MYSQLI_STATUS_VALID && my_res->status < MYSQLI_STATUS_VALID) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid object %d or resource %s", i, intern->zo.ce->name->val); + php_error_docref(NULL, E_WARNING, "Invalid object %d or resource %s", i, intern->zo.ce->name->val); continue; } (*out_array)[current++] = mysql->mysql; @@ -669,7 +669,7 @@ 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) +static int mysqlnd_zval_array_from_mysqlnd_array(MYSQLND **in_array, zval *out_array) { MYSQLND **p = in_array; zval dest_array; @@ -681,7 +681,7 @@ static int mysqlnd_zval_array_from_mysqlnd_array(MYSQLND **in_array, zval *out_a ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(out_array), elem) { i++; if (Z_TYPE_P(elem) != IS_OBJECT || - !instanceof_function(Z_OBJCE_P(elem), mysqli_link_class_entry TSRMLS_CC)) { + !instanceof_function(Z_OBJCE_P(elem), mysqli_link_class_entry)) { continue; } { @@ -689,7 +689,7 @@ static int mysqlnd_zval_array_from_mysqlnd_array(MYSQLND **in_array, zval *out_a MYSQLI_RESOURCE *my_res; mysqli_object *intern = Z_MYSQLI_P(elem); if (!(my_res = (MYSQLI_RESOURCE *)intern->ptr)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "[%d] Couldn't fetch %s", i, intern->zo.ce->name->val); + php_error_docref(NULL, E_WARNING, "[%d] Couldn't fetch %s", i, intern->zo.ce->name->val); continue; } mysql = (MY_MYSQL *) my_res->ptr; @@ -713,7 +713,7 @@ 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) +static int mysqlnd_dont_poll_zval_array_from_mysqlnd_array(MYSQLND **in_array, zval *in_zval_array, zval *out_array) { MYSQLND **p = in_array; zval proxy, *elem, *dest_elem; @@ -754,35 +754,35 @@ PHP_FUNCTION(mysqli_poll) enum_func_status ret; int desc_num; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!a!al|l", &r_array, &e_array, &dont_poll_array, &sec, &usec) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "a!a!al|l", &r_array, &e_array, &dont_poll_array, &sec, &usec) == FAILURE) { return; } if (sec < 0 || usec < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Negative values passed for sec and/or usec"); + php_error_docref(NULL, E_WARNING, "Negative values passed for sec and/or usec"); RETURN_FALSE; } if (!r_array && !e_array) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "No stream arrays were passed"); + php_error_docref(NULL, E_WARNING, "No stream arrays were passed"); RETURN_FALSE; } if (r_array != NULL) { - mysqlnd_zval_array_to_mysqlnd_array(r_array, &new_r_array TSRMLS_CC); + mysqlnd_zval_array_to_mysqlnd_array(r_array, &new_r_array); } if (e_array != NULL) { - mysqlnd_zval_array_to_mysqlnd_array(e_array, &new_e_array TSRMLS_CC); + mysqlnd_zval_array_to_mysqlnd_array(e_array, &new_e_array); } ret = mysqlnd_poll(new_r_array, new_e_array, &new_dont_poll_array, sec, usec, &desc_num); - mysqlnd_dont_poll_zval_array_from_mysqlnd_array(r_array != NULL ? new_dont_poll_array:NULL, r_array, dont_poll_array TSRMLS_CC); + mysqlnd_dont_poll_zval_array_from_mysqlnd_array(r_array != NULL ? new_dont_poll_array:NULL, r_array, dont_poll_array); if (r_array != NULL) { - mysqlnd_zval_array_from_mysqlnd_array(new_r_array, r_array TSRMLS_CC); + mysqlnd_zval_array_from_mysqlnd_array(new_r_array, r_array); } if (e_array != NULL) { - mysqlnd_zval_array_from_mysqlnd_array(new_e_array, e_array TSRMLS_CC); + mysqlnd_zval_array_from_mysqlnd_array(new_e_array, e_array); } if (new_dont_poll_array) { @@ -811,7 +811,7 @@ PHP_FUNCTION(mysqli_reap_async_query) MYSQLI_RESOURCE *mysqli_resource; MYSQL_RES *result = NULL; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { return; } @@ -824,7 +824,7 @@ PHP_FUNCTION(mysqli_reap_async_query) if (!mysql_field_count(mysql->mysql)) { /* no result set - not a SELECT */ if (MyG(report_mode) & MYSQLI_REPORT_INDEX) { -/* php_mysqli_report_index("n/a", mysqli_server_status(mysql->mysql) TSRMLS_CC); */ +/* php_mysqli_report_index("n/a", mysqli_server_status(mysql->mysql)); */ } RETURN_TRUE; } @@ -839,13 +839,13 @@ PHP_FUNCTION(mysqli_reap_async_query) } if (!result) { - php_mysqli_throw_sql_exception((char *)mysql_sqlstate(mysql->mysql), mysql_errno(mysql->mysql) TSRMLS_CC, + php_mysqli_throw_sql_exception((char *)mysql_sqlstate(mysql->mysql), mysql_errno(mysql->mysql), "%s", mysql_error(mysql->mysql)); RETURN_FALSE; } if (MyG(report_mode) & MYSQLI_REPORT_INDEX) { -/* php_mysqli_report_index("n/a", mysqli_server_status(mysql->mysql) TSRMLS_CC); */ +/* php_mysqli_report_index("n/a", mysqli_server_status(mysql->mysql)); */ } mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE)); @@ -864,7 +864,7 @@ PHP_FUNCTION(mysqli_stmt_get_result) MY_STMT *stmt; zval *mysql_stmt; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_stmt, mysqli_stmt_class_entry) == FAILURE) { return; } MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID); @@ -890,16 +890,16 @@ PHP_FUNCTION(mysqli_get_warnings) MYSQLI_RESOURCE *mysqli_resource; MYSQLI_WARNING *w; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { return; } MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); if (mysql_warning_count(mysql->mysql)) { #ifdef MYSQLI_USE_MYSQLND - w = php_get_warnings(mysql->mysql->data TSRMLS_CC); + w = php_get_warnings(mysql->mysql->data); #else - w = php_get_warnings(mysql->mysql TSRMLS_CC); + w = php_get_warnings(mysql->mysql); #endif } else { RETURN_FALSE; @@ -919,13 +919,13 @@ PHP_FUNCTION(mysqli_stmt_get_warnings) MYSQLI_RESOURCE *mysqli_resource; MYSQLI_WARNING *w; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &stmt_link, mysqli_stmt_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &stmt_link, mysqli_stmt_class_entry) == FAILURE) { return; } 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); + w = php_get_warnings(mysqli_stmt_get_connection(stmt->stmt)); } else { RETURN_FALSE; } @@ -946,7 +946,7 @@ PHP_FUNCTION(mysqli_set_charset) char *cs_name; size_t csname_len; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &cs_name, &csname_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &mysql_link, mysqli_link_class_entry, &cs_name, &csname_len) == FAILURE) { return; } MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); @@ -974,7 +974,7 @@ PHP_FUNCTION(mysqli_get_charset) const MYSQLND_CHARSET *cs; #endif - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { return; } MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); @@ -993,7 +993,7 @@ PHP_FUNCTION(mysqli_get_charset) #else cs = mysql->mysql->data->charset; if (!cs) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "The connection has no charset associated"); + php_error_docref(NULL, E_WARNING, "The connection has no charset associated"); RETURN_NULL(); } name = cs->name; @@ -1019,10 +1019,10 @@ PHP_FUNCTION(mysqli_get_charset) #endif #if !defined(MYSQLI_USE_MYSQLND) -extern char * mysqli_escape_string_for_tx_name_in_comment(const char * const name TSRMLS_DC); +extern char * mysqli_escape_string_for_tx_name_in_comment(const char * const name); /* {{{ proto bool mysqli_begin_transaction_libmysql */ -static int mysqli_begin_transaction_libmysql(MYSQL * conn, const unsigned int mode, const char * const name TSRMLS_DC) +static int mysqli_begin_transaction_libmysql(MYSQL * conn, const unsigned int mode, const char * const name) { int ret; zend_bool err = FALSE; @@ -1035,7 +1035,7 @@ static int mysqli_begin_transaction_libmysql(MYSQL * conn, const unsigned int mo } if (mode & (TRANS_START_READ_WRITE | TRANS_START_READ_ONLY)) { if (mysql_get_server_version(conn) < 50605L) { - 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"); + php_error_docref(NULL, 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.s) { @@ -1052,7 +1052,7 @@ static int mysqli_begin_transaction_libmysql(MYSQL * conn, const unsigned int mo smart_str_0(&tmp_str); if (err == FALSE){ - char * name_esc = mysqli_escape_string_for_tx_name_in_comment(name TSRMLS_CC); + char * name_esc = mysqli_escape_string_for_tx_name_in_comment(name); char * query; unsigned int query_len = spprintf(&query, 0, "START TRANSACTION%s %s", name_esc? name_esc:"", tmp_str.s? tmp_str.s->val:""); @@ -1081,16 +1081,16 @@ PHP_FUNCTION(mysqli_begin_transaction) size_t name_len = -1; zend_bool err = FALSE; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|ls", &mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), 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); if (flags < 0) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value for parameter flags (%pd)", flags); + php_error_docref(NULL, E_WARNING, "Invalid value for parameter flags (%pd)", flags); err = TRUE; } if (!name_len) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Savepoint name cannot be empty"); + php_error_docref(NULL, E_WARNING, "Savepoint name cannot be empty"); err = TRUE; } if (TRUE == err) { @@ -1098,7 +1098,7 @@ PHP_FUNCTION(mysqli_begin_transaction) } #if !defined(MYSQLI_USE_MYSQLND) - if (mysqli_begin_transaction_libmysql(mysql->mysql, flags, name TSRMLS_CC)) { + if (mysqli_begin_transaction_libmysql(mysql->mysql, flags, name)) { RETURN_FALSE; } #else @@ -1133,12 +1133,12 @@ PHP_FUNCTION(mysqli_savepoint) char * name = NULL; size_t name_len = -1; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &mysql_link, mysqli_link_class_entry, &name, &name_len) == FAILURE) { return; } 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"); + php_error_docref(NULL, E_WARNING, "Savepoint name cannot be empty"); RETURN_FALSE; } @@ -1162,12 +1162,12 @@ PHP_FUNCTION(mysqli_release_savepoint) char * name = NULL; size_t name_len = -1; - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &name, &name_len) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &mysql_link, mysqli_link_class_entry, &name, &name_len) == FAILURE) { return; } 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"); + php_error_docref(NULL, E_WARNING, "Savepoint name cannot be empty"); RETURN_FALSE; } #if !defined(MYSQLI_USE_MYSQLND) @@ -1186,7 +1186,7 @@ PHP_FUNCTION(mysqli_release_savepoint) PHP_FUNCTION(mysqli_get_links_stats) { if (ZEND_NUM_ARGS()) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "no parameters expected"); + php_error_docref(NULL, E_WARNING, "no parameters expected"); return; } array_init(return_value); |