mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
ported ext/mysqli
This commit is contained in:
Anatol Belski
parent
bdbf47df18
commit
c517d6d853
8 changed files with 108 additions and 108 deletions
|
|
@ -213,9 +213,9 @@ int mysqli_stmt_bind_param_do_bind(MY_STMT *stmt, unsigned int argc, unsigned in
|
|||
break;
|
||||
|
||||
case 'i': /* Integer */
|
||||
#if SIZEOF_LONG==8
|
||||
#if SIZEOF_ZEND_INT==8
|
||||
bind[ofs].buffer_type = MYSQL_TYPE_LONGLONG;
|
||||
#elif SIZEOF_LONG==4
|
||||
#elif SIZEOF_ZEND_INT==4
|
||||
bind[ofs].buffer_type = MYSQL_TYPE_LONG;
|
||||
#endif
|
||||
bind[ofs].buffer = &Z_IVAL_P(param);
|
||||
|
|
@ -284,9 +284,9 @@ int mysqli_stmt_bind_param_do_bind(MY_STMT *stmt, unsigned int argc, unsigned in
|
|||
type = MYSQL_TYPE_DOUBLE;
|
||||
break;
|
||||
case 'i': /* Integer */
|
||||
#if SIZEOF_LONG==8
|
||||
#if SIZEOF_ZEND_INT==8
|
||||
type = MYSQL_TYPE_LONGLONG;
|
||||
#elif SIZEOF_LONG==4
|
||||
#elif SIZEOF_ZEND_INT==4
|
||||
type = MYSQL_TYPE_LONG;
|
||||
#endif
|
||||
break;
|
||||
|
|
@ -326,7 +326,7 @@ PHP_FUNCTION(mysqli_stmt_bind_param)
|
|||
zval *mysql_stmt;
|
||||
char *types;
|
||||
int types_len;
|
||||
unsigned long rc;
|
||||
php_uint_t rc;
|
||||
|
||||
/* calculate and check number of parameters */
|
||||
if (argc < 2) {
|
||||
|
|
@ -392,7 +392,7 @@ mysqli_stmt_bind_result_do_bind(MY_STMT *stmt, zval *args, unsigned int argc, un
|
|||
int i, ofs;
|
||||
int var_cnt = argc - start;
|
||||
long col_type;
|
||||
ulong rc;
|
||||
php_uint_t rc;
|
||||
|
||||
/* prevent leak if variables are already bound */
|
||||
if (stmt->result.var_cnt) {
|
||||
|
|
@ -488,7 +488,7 @@ mysqli_stmt_bind_result_do_bind(MY_STMT *stmt, zval *args, unsigned int argc, un
|
|||
/* Changed to my_bool in MySQL 5.1. See MySQL Bug #16144 */
|
||||
my_bool tmp;
|
||||
#else
|
||||
ulong tmp = 0;
|
||||
php_uint_t tmp = 0;
|
||||
#endif
|
||||
stmt->result.buf[ofs].type = IS_STRING;
|
||||
/*
|
||||
|
|
@ -578,7 +578,7 @@ PHP_FUNCTION(mysqli_stmt_bind_result)
|
|||
zval *args;
|
||||
int argc = ZEND_NUM_ARGS();
|
||||
int start = 1;
|
||||
ulong rc;
|
||||
php_uint_t rc;
|
||||
MY_STMT *stmt;
|
||||
zval *mysql_stmt;
|
||||
|
||||
|
|
@ -624,7 +624,7 @@ PHP_FUNCTION(mysqli_change_user)
|
|||
zval *mysql_link = NULL;
|
||||
char *user, *password, *dbname;
|
||||
int user_len, password_len, dbname_len;
|
||||
ulong rc;
|
||||
php_uint_t rc;
|
||||
#if !defined(MYSQLI_USE_MYSQLND) && defined(HAVE_MYSQLI_SET_CHARSET)
|
||||
const CHARSET_INFO * old_charset;
|
||||
#endif
|
||||
|
|
@ -752,11 +752,11 @@ PHP_FUNCTION(mysqli_commit)
|
|||
{
|
||||
MY_MYSQL *mysql;
|
||||
zval *mysql_link;
|
||||
long flags = TRANS_COR_NO_OPT;
|
||||
php_int_t flags = TRANS_COR_NO_OPT;
|
||||
char * name = NULL;
|
||||
int name_len = 0;
|
||||
|
||||
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() TSRMLS_CC, getThis(), "O|is", &mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
|
||||
|
|
@ -778,9 +778,9 @@ PHP_FUNCTION(mysqli_data_seek)
|
|||
{
|
||||
MYSQL_RES *result;
|
||||
zval *mysql_result;
|
||||
long offset;
|
||||
php_int_t offset;
|
||||
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &mysql_result, mysqli_result_class_entry, &offset) == FAILURE) {
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &mysql_result, mysqli_result_class_entry, &offset) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -951,7 +951,7 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS)
|
|||
MY_STMT *stmt;
|
||||
zval *mysql_stmt;
|
||||
unsigned int i;
|
||||
ulong ret;
|
||||
php_uint_t ret;
|
||||
unsigned int uval;
|
||||
my_ulonglong llval;
|
||||
|
||||
|
|
@ -996,7 +996,7 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS)
|
|||
{
|
||||
/* unsigned int (11) */
|
||||
uval= *(unsigned int *) stmt->result.buf[i].val;
|
||||
#if SIZEOF_LONG==4
|
||||
#if SIZEOF_ZEND_INT==4
|
||||
if (uval > INT_MAX) {
|
||||
char *tmp, *p;
|
||||
int j = 10;
|
||||
|
|
@ -1047,9 +1047,9 @@ void mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAMETERS)
|
|||
{
|
||||
llval= *(my_ulonglong *) stmt->result.buf[i].val;
|
||||
}
|
||||
#if SIZEOF_LONG==8
|
||||
#if SIZEOF_ZEND_INT==8
|
||||
if (uns && llval > 9223372036854775807L) {
|
||||
#elif SIZEOF_LONG==4
|
||||
#elif SIZEOF_ZEND_INT==4
|
||||
if ((uns && llval > L64(2147483647)) ||
|
||||
(!uns && (( L64(2147483647) < (my_longlong) llval) ||
|
||||
(L64(-2147483648) > (my_longlong) llval))))
|
||||
|
|
@ -1234,15 +1234,15 @@ PHP_FUNCTION(mysqli_fetch_field_direct)
|
|||
MYSQL_RES *result;
|
||||
zval *mysql_result;
|
||||
const MYSQL_FIELD *field;
|
||||
long offset;
|
||||
php_int_t offset;
|
||||
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &mysql_result, mysqli_result_class_entry, &offset) == FAILURE) {
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &mysql_result, mysqli_result_class_entry, &offset) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
|
||||
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
|
||||
|
||||
if (offset < 0 || offset >= (long) mysql_num_fields(result)) {
|
||||
if (offset < 0 || offset >= (php_int_t) mysql_num_fields(result)) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Field offset is invalid for resultset");
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
|
@ -1263,7 +1263,7 @@ PHP_FUNCTION(mysqli_fetch_lengths)
|
|||
MYSQL_RES *result;
|
||||
zval *mysql_result;
|
||||
unsigned int i;
|
||||
unsigned long *ret;
|
||||
php_uint_t *ret;
|
||||
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_result, mysqli_result_class_entry) == FAILURE) {
|
||||
return;
|
||||
|
|
@ -1315,9 +1315,9 @@ PHP_FUNCTION(mysqli_field_seek)
|
|||
{
|
||||
MYSQL_RES *result;
|
||||
zval *mysql_result;
|
||||
long fieldnr;
|
||||
php_int_t fieldnr;
|
||||
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &mysql_result, mysqli_result_class_entry, &fieldnr) == FAILURE) {
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &mysql_result, mysqli_result_class_entry, &fieldnr) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
MYSQLI_FETCH_RESOURCE(result, MYSQL_RES *, mysql_result, "mysqli_result", MYSQLI_STATUS_VALID);
|
||||
|
|
@ -1380,7 +1380,7 @@ PHP_FUNCTION(mysqli_get_client_info)
|
|||
Get MySQL client info */
|
||||
PHP_FUNCTION(mysqli_get_client_version)
|
||||
{
|
||||
RETURN_INT((long)mysql_get_client_version());
|
||||
RETURN_INT((php_int_t)mysql_get_client_version());
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
|
|
@ -1550,9 +1550,9 @@ PHP_FUNCTION(mysqli_kill)
|
|||
{
|
||||
MY_MYSQL *mysql;
|
||||
zval *mysql_link;
|
||||
long processid;
|
||||
php_int_t processid;
|
||||
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &mysql_link, mysqli_link_class_entry, &processid) == FAILURE) {
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &mysql_link, mysqli_link_class_entry, &processid) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
|
||||
|
|
@ -1761,12 +1761,12 @@ PHP_FUNCTION(mysqli_options)
|
|||
MY_MYSQL *mysql;
|
||||
zval *mysql_link = NULL;
|
||||
zval *mysql_value;
|
||||
long mysql_option;
|
||||
php_int_t mysql_option;
|
||||
unsigned int l_value;
|
||||
long ret;
|
||||
php_int_t ret;
|
||||
int expected_type;
|
||||
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Olz", &mysql_link, mysqli_link_class_entry, &mysql_option, &mysql_value) == FAILURE) {
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oiz", &mysql_link, mysqli_link_class_entry, &mysql_option, &mysql_value) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_INITIALIZED);
|
||||
|
|
@ -1816,7 +1816,7 @@ PHP_FUNCTION(mysqli_ping)
|
|||
{
|
||||
MY_MYSQL *mysql;
|
||||
zval *mysql_link;
|
||||
long rc;
|
||||
php_int_t rc;
|
||||
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
|
||||
return;
|
||||
|
|
@ -1976,11 +1976,11 @@ PHP_FUNCTION(mysqli_rollback)
|
|||
{
|
||||
MY_MYSQL *mysql;
|
||||
zval *mysql_link;
|
||||
long flags = TRANS_COR_NO_OPT;
|
||||
php_int_t flags = TRANS_COR_NO_OPT;
|
||||
char * name = NULL;
|
||||
int name_len = 0;
|
||||
|
||||
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() TSRMLS_CC, getThis(), "O|is", &mysql_link, mysqli_link_class_entry, &flags, &name, &name_len) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
|
||||
|
|
@ -2003,10 +2003,10 @@ PHP_FUNCTION(mysqli_stmt_send_long_data)
|
|||
MY_STMT *stmt;
|
||||
zval *mysql_stmt;
|
||||
char *data;
|
||||
long param_nr;
|
||||
php_int_t param_nr;
|
||||
int data_len;
|
||||
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ols", &mysql_stmt, mysqli_stmt_class_entry, ¶m_nr, &data, &data_len) == FAILURE) {
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ois", &mysql_stmt, mysqli_stmt_class_entry, ¶m_nr, &data, &data_len) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
|
||||
|
|
@ -2069,9 +2069,9 @@ PHP_FUNCTION(mysqli_stmt_data_seek)
|
|||
{
|
||||
MY_STMT *stmt;
|
||||
zval *mysql_stmt;
|
||||
long offset;
|
||||
php_int_t offset;
|
||||
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &mysql_stmt, mysqli_stmt_class_entry, &offset) == FAILURE) {
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &mysql_stmt, mysqli_stmt_class_entry, &offset) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
if (offset < 0) {
|
||||
|
|
@ -2296,9 +2296,9 @@ PHP_FUNCTION(mysqli_refresh)
|
|||
{
|
||||
MY_MYSQL *mysql;
|
||||
zval *mysql_link = NULL;
|
||||
long options;
|
||||
php_int_t options;
|
||||
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &mysql_link, mysqli_link_class_entry, &options) == FAILURE) {
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &mysql_link, mysqli_link_class_entry, &options) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_INITIALIZED);
|
||||
|
|
@ -2316,21 +2316,21 @@ PHP_FUNCTION(mysqli_stmt_attr_set)
|
|||
{
|
||||
MY_STMT *stmt;
|
||||
zval *mysql_stmt;
|
||||
long mode_in;
|
||||
php_int_t mode_in;
|
||||
#if MYSQL_VERSION_ID >= 50107
|
||||
my_bool mode_b;
|
||||
#endif
|
||||
ulong mode;
|
||||
ulong attr;
|
||||
php_uint_t mode;
|
||||
php_int_t attr;
|
||||
void *mode_p;
|
||||
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oll", &mysql_stmt, mysqli_stmt_class_entry, &attr, &mode_in) == FAILURE) {
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oii", &mysql_stmt, mysqli_stmt_class_entry, &attr, &mode_in) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
|
||||
|
||||
if (mode_in < 0) {
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "mode should be non-negative, %ld passed", mode_in);
|
||||
php_error_docref(NULL TSRMLS_CC, E_WARNING, "mode should be non-negative, %pd passed", mode_in);
|
||||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
|
|
@ -2363,11 +2363,11 @@ PHP_FUNCTION(mysqli_stmt_attr_get)
|
|||
{
|
||||
MY_STMT *stmt;
|
||||
zval *mysql_stmt;
|
||||
ulong value = 0;
|
||||
ulong attr;
|
||||
php_uint_t value = 0;
|
||||
php_int_t attr;
|
||||
int rc;
|
||||
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol", &mysql_stmt, mysqli_stmt_class_entry, &attr) == FAILURE) {
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oi", &mysql_stmt, mysqli_stmt_class_entry, &attr) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
MYSQLI_FETCH_RESOURCE_STMT(stmt, mysql_stmt, MYSQLI_STATUS_VALID);
|
||||
|
|
@ -2380,7 +2380,7 @@ PHP_FUNCTION(mysqli_stmt_attr_get)
|
|||
if (attr == STMT_ATTR_UPDATE_MAX_LENGTH)
|
||||
value = *((my_bool *)&value);
|
||||
#endif
|
||||
RETURN_INT((long)value);
|
||||
RETURN_INT((php_uint_t)value);
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
|
|
@ -2580,10 +2580,10 @@ PHP_FUNCTION(mysqli_store_result)
|
|||
MYSQL_RES *result;
|
||||
zval *mysql_link;
|
||||
MYSQLI_RESOURCE *mysqli_resource;
|
||||
long flags = 0;
|
||||
php_int_t flags = 0;
|
||||
|
||||
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|l", &mysql_link, mysqli_link_class_entry, &flags) == FAILURE) {
|
||||
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O|i", &mysql_link, mysqli_link_class_entry, &flags) == FAILURE) {
|
||||
return;
|
||||
}
|
||||
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
|
||||
|
|
@ -2619,7 +2619,7 @@ PHP_FUNCTION(mysqli_thread_id)
|
|||
}
|
||||
MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
|
||||
|
||||
RETURN_INT((long) mysql_thread_id(mysql->mysql));
|
||||
RETURN_INT((php_int_t) mysql_thread_id(mysql->mysql));
|
||||
}
|
||||
/* }}} */
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue