Skip to content

Commit 057ad56

Browse files
committed
Don't use the specific translated name but use the macro for this
1 parent 6cb3d90 commit 057ad56

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

ext/mysqlnd/mysqlnd.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ PHPAPI const MYSQLND_CHARSET * mysqlnd_find_charset_name(const char * const char
8888
#define mysqlnd_connect(conn, host, user, pass, pass_len, db, db_len, port, socket, mysql_flags, client_api_flags) \
8989
mysqlnd_connection_connect((conn), (host), (user), (pass), (pass_len), (db), (db_len), (port), (socket), (mysql_flags), (client_api_flags))
9090

91-
PHPAPI MYSQLND * mysqlnd_connection_init(const size_t client_flags, const zend_bool persistent, struct st_mysqlnd_object_factory_methods * object_factory);
91+
PHPAPI MYSQLND * mysqlnd_connection_init(const size_t client_flags, const zend_bool persistent, MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory) *object_factory);
9292
PHPAPI MYSQLND * mysqlnd_connection_connect(MYSQLND * conn,
9393
const char * const host,
9494
const char * const user,

ext/mysqlnd/mysqlnd_connection.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -2726,9 +2726,9 @@ PHPAPI MYSQLND * mysqlnd_connection_connect(MYSQLND * conn_handle,
27262726

27272727
/* {{{ mysqlnd_connection_init */
27282728
PHPAPI MYSQLND *
2729-
mysqlnd_connection_init(const size_t client_flags, const zend_bool persistent, struct st_mysqlnd_object_factory_methods * object_factory)
2729+
mysqlnd_connection_init(const size_t client_flags, const zend_bool persistent, MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory) *object_factory)
27302730
{
2731-
struct st_mysqlnd_object_factory_methods * factory = object_factory? object_factory : &MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_object_factory);
2731+
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory) *factory = object_factory? object_factory : &MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_object_factory);
27322732
MYSQLND * ret;
27332733
DBG_ENTER("mysqlnd_connection_init");
27342734
ret = factory->get_connection(factory, persistent);

ext/mysqlnd/mysqlnd_driver.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ PHPAPI void mysqlnd_library_init(void)
9696

9797
/* {{{ mysqlnd_object_factory::get_connection */
9898
static MYSQLND *
99-
MYSQLND_METHOD(mysqlnd_object_factory, get_connection)(struct st_mysqlnd_object_factory_methods * factory, const zend_bool persistent)
99+
MYSQLND_METHOD(mysqlnd_object_factory, get_connection)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory) *factory, const zend_bool persistent)
100100
{
101101
size_t alloc_size_ret = sizeof(MYSQLND) + mysqlnd_plugin_count() * sizeof(void *);
102102
size_t alloc_size_ret_data = sizeof(MYSQLND_CONN_DATA) + mysqlnd_plugin_count() * sizeof(void *);

ext/mysqlnd/mysqlnd_structs.h

+1-3
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ MYSQLND_CLASS_METHODS_TYPE(mysqlnd_vio)
365365

366366
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory);
367367

368-
typedef MYSQLND * (*func_mysqlnd_object_factory__get_connection)(struct st_mysqlnd_object_factory_methods * factory, const zend_bool persistent);
368+
typedef MYSQLND * (*func_mysqlnd_object_factory__get_connection)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory) * factory, const zend_bool persistent);
369369
typedef MYSQLND * (*func_mysqlnd_object_factory__clone_connection_object)(MYSQLND * conn);
370370
typedef MYSQLND_STMT * (*func_mysqlnd_object_factory__get_prepared_statement)(MYSQLND_CONN_DATA * conn, const zend_bool persistent);
371371
typedef MYSQLND_PFC * (*func_mysqlnd_object_factory__get_pfc)(const zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info);
@@ -534,8 +534,6 @@ MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data)
534534
func_mysqlnd_conn_data__get_reference get_reference;
535535
func_mysqlnd_conn_data__free_reference free_reference;
536536

537-
// func_mysqlnd_conn_data__send_command_handle_response send_command_handle_response;
538-
539537
func_mysqlnd_conn_data__restart_psession restart_psession;
540538
func_mysqlnd_conn_data__end_psession end_psession;
541539
func_mysqlnd_conn_data__send_close send_close;

0 commit comments

Comments
 (0)