Skip to content

Commit be4f73f

Browse files
committed
MySQLnd: Remove unused fetch_field_data method
This method is not used, and is implemented in a very dubious way.
1 parent 36ff92e commit be4f73f

File tree

3 files changed

+0
-40
lines changed

3 files changed

+0
-40
lines changed

ext/mysqlnd/mysqlnd.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ PHPAPI void mysqlnd_debug(const char *mode);
101101
#define mysqlnd_fetch_into(result, flags, ret_val, ext) (result)->m.fetch_into((result), (flags), (ret_val), (ext) ZEND_FILE_LINE_CC)
102102
#define mysqlnd_fetch_row_c(result) (result)->m.fetch_row_c((result))
103103
#define mysqlnd_fetch_all(result, flags, return_value) (result)->m.fetch_all((result), (flags), (return_value) ZEND_FILE_LINE_CC)
104-
#define mysqlnd_result_fetch_field_data(res,offset,ret) (res)->m.fetch_field_data((res), (offset), (ret))
105104
#define mysqlnd_get_connection_stats(conn, values) ((conn)->data)->m->get_statistics((conn)->data, (values) ZEND_FILE_LINE_CC)
106105
#define mysqlnd_get_client_stats(values) _mysqlnd_get_client_stats(mysqlnd_global_stats, (values) ZEND_FILE_LINE_CC)
107106

ext/mysqlnd/mysqlnd_result.c

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1791,50 +1791,13 @@ MYSQLND_METHOD(mysqlnd_res, fetch_all)(MYSQLND_RES * result, const unsigned int
17911791
/* }}} */
17921792

17931793

1794-
/* {{{ mysqlnd_res::fetch_field_data */
1795-
static void
1796-
MYSQLND_METHOD(mysqlnd_res, fetch_field_data)(MYSQLND_RES * result, const unsigned int offset, zval *return_value)
1797-
{
1798-
zval row;
1799-
zval *entry;
1800-
unsigned int i = 0;
1801-
1802-
DBG_ENTER("mysqlnd_res::fetch_field_data");
1803-
DBG_INF_FMT("offset=%u", offset);
1804-
/*
1805-
Hint Zend how many elements we will have in the hash. Thus it won't
1806-
extend and rehash the hash constantly.
1807-
*/
1808-
mysqlnd_fetch_into(result, MYSQLND_FETCH_NUM, &row, MYSQLND_MYSQL);
1809-
if (Z_TYPE(row) != IS_ARRAY) {
1810-
zval_ptr_dtor_nogc(&row);
1811-
RETVAL_NULL();
1812-
DBG_VOID_RETURN;
1813-
}
1814-
1815-
zend_hash_internal_pointer_reset(Z_ARRVAL(row));
1816-
while (i++ < offset) {
1817-
zend_hash_move_forward(Z_ARRVAL(row));
1818-
}
1819-
1820-
entry = zend_hash_get_current_data(Z_ARRVAL(row));
1821-
1822-
ZVAL_COPY(return_value, entry);
1823-
zval_ptr_dtor_nogc(&row);
1824-
1825-
DBG_VOID_RETURN;
1826-
}
1827-
/* }}} */
1828-
1829-
18301794
MYSQLND_CLASS_METHODS_START(mysqlnd_res)
18311795
MYSQLND_METHOD(mysqlnd_res, fetch_row),
18321796
MYSQLND_METHOD(mysqlnd_res, use_result),
18331797
MYSQLND_METHOD(mysqlnd_res, store_result),
18341798
MYSQLND_METHOD(mysqlnd_res, fetch_into),
18351799
MYSQLND_METHOD(mysqlnd_res, fetch_row_c),
18361800
MYSQLND_METHOD(mysqlnd_res, fetch_all),
1837-
MYSQLND_METHOD(mysqlnd_res, fetch_field_data),
18381801
MYSQLND_METHOD(mysqlnd_res, num_rows),
18391802
MYSQLND_METHOD(mysqlnd_res, num_fields),
18401803
MYSQLND_METHOD(mysqlnd_res, skip_result),

ext/mysqlnd/mysqlnd_structs.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,6 @@ typedef MYSQLND_RES * (*func_mysqlnd_res__store_result)(MYSQLND_RES * result, M
644644
typedef void (*func_mysqlnd_res__fetch_into)(MYSQLND_RES *result, const unsigned int flags, zval *return_value, enum_mysqlnd_extension ext ZEND_FILE_LINE_DC);
645645
typedef MYSQLND_ROW_C (*func_mysqlnd_res__fetch_row_c)(MYSQLND_RES *result);
646646
typedef void (*func_mysqlnd_res__fetch_all)(MYSQLND_RES *result, const unsigned int flags, zval *return_value ZEND_FILE_LINE_DC);
647-
typedef void (*func_mysqlnd_res__fetch_field_data)(MYSQLND_RES *result, const unsigned int offset, zval *return_value);
648647
typedef uint64_t (*func_mysqlnd_res__num_rows)(const MYSQLND_RES * const result);
649648
typedef unsigned int (*func_mysqlnd_res__num_fields)(const MYSQLND_RES * const result);
650649
typedef enum_func_status (*func_mysqlnd_res__skip_result)(MYSQLND_RES * const result);
@@ -678,7 +677,6 @@ MYSQLND_CLASS_METHODS_TYPE(mysqlnd_res)
678677
func_mysqlnd_res__fetch_into fetch_into;
679678
func_mysqlnd_res__fetch_row_c fetch_row_c;
680679
func_mysqlnd_res__fetch_all fetch_all;
681-
func_mysqlnd_res__fetch_field_data fetch_field_data;
682680
func_mysqlnd_res__num_rows num_rows;
683681
func_mysqlnd_res__num_fields num_fields;
684682
func_mysqlnd_res__skip_result skip_result;

0 commit comments

Comments
 (0)