diff options
Diffstat (limited to 'ext/mysqli')
| -rw-r--r-- | ext/mysqli/mysqli.c | 2 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 4 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 16 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_prop.c | 4 |
4 files changed, 13 insertions, 13 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 379bf5f855..f6db20c65e 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -1160,7 +1160,7 @@ void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * result, zend unsigned int i; MYSQL_FIELD *fields; zend_ulong *field_len; - + if (!(row = mysql_fetch_row(result))) { RETURN_NULL(); } diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 7ea4d6a1a0..b5877bed41 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -718,7 +718,7 @@ void php_mysqli_close(MY_MYSQL * mysql, int close_type, int resource_status) FAIL == mysqlnd_rollback(mysql->mysql, TRANS_COR_NO_OPT, NULL)) #endif { - mysqli_close(mysql->mysql, close_type); + mysqli_close(mysql->mysql, close_type); } else { zend_ptr_stack_push(&plist->free_links, mysql->mysql); MyG(num_inactive_persistent)++; @@ -1504,7 +1504,7 @@ void php_mysqli_init(INTERNAL_FUNCTION_PARAMETERS) MYSQLI_RESOURCE *mysqli_resource; MY_MYSQL *mysql; -// TODO: We can't properly check if this was to mysql_init() in a class method +// TODO: We can't properly check if this was to mysql_init() in a class method // or a call to mysqli->init(). // To solve the problem, we added instanceof check for the class of $this // ??? diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 32bdcdfa69..ddfdeef5b8 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -424,7 +424,7 @@ PHP_FUNCTION(mysqli_error_list) zend_llist_position pos; for (message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_first_ex(mysql->mysql->data->error_info->error_list, &pos); message; - message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_next_ex(mysql->mysql->data->error_info->error_list, &pos)) + message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_next_ex(mysql->mysql->data->error_info->error_list, &pos)) { zval single_error; array_init(&single_error); @@ -465,7 +465,7 @@ PHP_FUNCTION(mysqli_stmt_error_list) zend_llist_position pos; for (message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_first_ex(stmt->stmt->data->error_info->error_list, &pos); message; - message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_next_ex(stmt->stmt->data->error_info->error_list, &pos)) + message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_next_ex(stmt->stmt->data->error_info->error_list, &pos)) { zval single_error; array_init(&single_error); @@ -680,7 +680,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 || + if (Z_TYPE_P(elem) != IS_OBJECT || !instanceof_function(Z_OBJCE_P(elem), mysqli_link_class_entry)) { continue; } @@ -1094,9 +1094,9 @@ PHP_FUNCTION(mysqli_begin_transaction) err = TRUE; } if (TRUE == err) { - RETURN_FALSE; + RETURN_FALSE; } - + #if !defined(MYSQLI_USE_MYSQLND) if (mysqli_begin_transaction_libmysql(mysql->mysql, flags, name)) { RETURN_FALSE; @@ -1139,7 +1139,7 @@ PHP_FUNCTION(mysqli_savepoint) MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); if (!name || !name_len) { php_error_docref(NULL, E_WARNING, "Savepoint name cannot be empty"); - RETURN_FALSE; + RETURN_FALSE; } #if !defined(MYSQLI_USE_MYSQLND) @@ -1167,7 +1167,7 @@ PHP_FUNCTION(mysqli_release_savepoint) } MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID); if (!name || !name_len) { - php_error_docref(NULL, 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) @@ -1187,7 +1187,7 @@ PHP_FUNCTION(mysqli_get_links_stats) { if (ZEND_NUM_ARGS()) { php_error_docref(NULL, E_WARNING, "no parameters expected"); - return; + return; } array_init(return_value); add_assoc_long_ex(return_value, "total", sizeof("total") - 1, MyG(num_links)); diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c index e4377ff273..2cb44a1ca7 100644 --- a/ext/mysqli/mysqli_prop.c +++ b/ext/mysqli/mysqli_prop.c @@ -194,7 +194,7 @@ static zval *link_error_list_read(mysqli_object *obj, zval *retval) zend_llist_position pos; for (message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_first_ex(mysql->mysql->data->error_info->error_list, &pos); message; - message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_next_ex(mysql->mysql->data->error_info->error_list, &pos)) + message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_next_ex(mysql->mysql->data->error_info->error_list, &pos)) { zval single_error; array_init(&single_error); @@ -380,7 +380,7 @@ static zval *stmt_error_list_read(mysqli_object *obj, zval *retval) zend_llist_position pos; for (message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_first_ex(stmt->stmt->data->error_info->error_list, &pos); message; - message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_next_ex(stmt->stmt->data->error_info->error_list, &pos)) + message = (MYSQLND_ERROR_LIST_ELEMENT *) zend_llist_get_next_ex(stmt->stmt->data->error_info->error_list, &pos)) { zval single_error; array_init(&single_error); |