MNDR:

- switch to macro generation of structure names for the methods

1 files changed, 25 insertions, 24 deletions

diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index 3eb1d77e03..7154fdb256 100644
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -28,6 +28,7 @@
 #define MYSQLND_TYPEDEFED_METHODS
 
 #define MYSQLND_CLASS_METHOD_TABLE_NAME(class) mysqlnd_##class##_methods
+#define MYSQLND_CLASS_METHODS_TYPE(class) struct st_##class##_methods
 #define MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(class) struct st_##class##_methods
 #define MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(class) MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(class) MYSQLND_CLASS_METHOD_TABLE_NAME(class)
 
@@ -103,7 +104,7 @@ typedef struct st_mysqlnd_upsert_status MYSQLND_UPSERT_STATUS;
 typedef void (*func_mysqlnd_upsert_status__reset)(MYSQLND_UPSERT_STATUS * const upsert_status);
 typedef void (*func_mysqlnd_upsert_status__set_affected_rows_to_error)(MYSQLND_UPSERT_STATUS * const upsert_status);
 
-MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_upsert_status)
+MYSQLND_CLASS_METHODS_TYPE(mysqlnd_upsert_status)
 {
 	func_mysqlnd_upsert_status__reset reset;
 	func_mysqlnd_upsert_status__set_affected_rows_to_error set_affected_rows_to_error;
@@ -126,7 +127,7 @@ typedef void (*func_mysqlnd_error_info__reset)(MYSQLND_ERROR_INFO * const info);
 typedef void (*func_mysqlnd_error_info__set_client_error)(MYSQLND_ERROR_INFO * const info, const unsigned int err_no, const char * const sqlstate, const char * const error);
 
 
-MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_error_info)
+MYSQLND_CLASS_METHODS_TYPE(mysqlnd_error_info)
 {
 	func_mysqlnd_error_info__reset reset;
 	func_mysqlnd_error_info__set_client_error set_client_error;
@@ -139,7 +140,7 @@ struct st_mysqlnd_error_info
 	unsigned int error_no;
 	zend_llist * error_list;
 
-	MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_error_info) *m;
+	MYSQLND_CLASS_METHODS_TYPE(mysqlnd_error_info) *m;
 };
 
 
@@ -330,7 +331,7 @@ typedef func_mysqlnd_net__open_stream (*func_mysqlnd_net__get_open_stream)(MYSQL
 typedef void				(*func_mysqlnd_net__post_connect_set_opt)(MYSQLND_NET * const net, const char * const scheme, const size_t scheme_len, MYSQLND_STATS * const conn_stats, MYSQLND_ERROR_INFO * const error_info);
 typedef enum_func_status	(*func_mysqlnd_net__read_compressed_packet_from_stream_and_fill_read_buffer)(MYSQLND_NET * net, size_t net_payload_size, MYSQLND_STATS * conn_stats, MYSQLND_ERROR_INFO * error_info);
 
-MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_net)
+MYSQLND_CLASS_METHODS_TYPE(mysqlnd_net)
 {
 	func_mysqlnd_net__init init;
 	func_mysqlnd_net__dtor dtor;
@@ -401,7 +402,7 @@ typedef struct st_mysqlnd_packet_chg_user_resp*(*func_mysqlnd_protocol_payload_d
 typedef struct st_mysqlnd_packet_sha256_pk_request *(*func_mysqlnd_protocol_payload_decoder_factory__get_sha256_pk_request_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, zend_bool persistent);
 typedef struct st_mysqlnd_packet_sha256_pk_request_response *(*func_mysqlnd_protocol_payload_decoder_factory__get_sha256_pk_request_response_packet)(MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const factory, zend_bool persistent);
 
-MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_protocol_payload_decoder_factory)
+MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_payload_decoder_factory)
 {
 	func_mysqlnd_protocol_payload_decoder_factory__get_mysqlnd_conn_data get_mysqlnd_conn_data;
 	func_mysqlnd_protocol_payload_decoder_factory__get_greet_packet get_greet_packet;
@@ -426,7 +427,7 @@ MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_protocol_payload_decoder_factory)
 };
 
 
-MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_object_factory);
+MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory);
 
 typedef MYSQLND * (*func_mysqlnd_object_factory__get_connection)(struct st_mysqlnd_object_factory_methods * factory, zend_bool persistent);
 typedef MYSQLND * (*func_mysqlnd_object_factory__clone_connection_object)(MYSQLND * conn);
@@ -435,7 +436,7 @@ typedef MYSQLND_NET * (*func_mysqlnd_object_factory__get_io_channel)(zend_bool p
 typedef MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * (*func_mysqlnd_object_factory__get_protocol_payload_decoder_factory)(MYSQLND_CONN_DATA * conn, zend_bool persistent);
 
 
-MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_object_factory)
+MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory)
 {
 	func_mysqlnd_object_factory__get_connection get_connection;
 	func_mysqlnd_object_factory__clone_connection_object clone_connection_object;
@@ -537,7 +538,7 @@ typedef unsigned int		(*func_mysqlnd_conn_data__negotiate_client_api_capabilitie
 typedef unsigned int		(*func_mysqlnd_conn_data__get_client_api_capabilities)(const MYSQLND_CONN_DATA * const conn);
 
 
-MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_conn_data)
+MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data)
 {
 	func_mysqlnd_conn_data__connect connect;
 	func_mysqlnd_conn_data__escape_string escape_string;
@@ -637,7 +638,7 @@ typedef MYSQLND *			(*func_mysqlnd_conn__clone_object)(MYSQLND * const conn);
 typedef void				(*func_mysqlnd_conn__dtor)(MYSQLND * conn);
 typedef enum_func_status	(*func_mysqlnd_conn__close)(MYSQLND * conn, enum_connection_close_type close_type);
 
-MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_conn)
+MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn)
 {
 	func_mysqlnd_data__connect connect;
 	func_mysqlnd_conn__clone_object clone_object;
@@ -681,7 +682,7 @@ typedef void				(*func_mysqlnd_res__unbuffered_free_last_data)(MYSQLND_RES *resu
 
 typedef MYSQLND_RES_METADATA * (*func_mysqlnd_res__result_meta_init)(unsigned int field_count, zend_bool persistent);
 
-MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_res)
+MYSQLND_CLASS_METHODS_TYPE(mysqlnd_res)
 {
 	mysqlnd_fetch_row_func	fetch_row;
 
@@ -723,7 +724,7 @@ typedef zend_ulong *		(*func_mysqlnd_result_unbuffered__fetch_lengths)(MYSQLND_R
 typedef void				(*func_mysqlnd_result_unbuffered__free_last_data)(MYSQLND_RES_UNBUFFERED * result, MYSQLND_STATS * const global_stats);
 typedef void				(*func_mysqlnd_result_unbuffered__free_result)(MYSQLND_RES_UNBUFFERED * const result, MYSQLND_STATS * const global_stats);
 
-MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_result_unbuffered)
+MYSQLND_CLASS_METHODS_TYPE(mysqlnd_result_unbuffered)
 {
 	mysqlnd_fetch_row_func							fetch_row;
 	func_mysqlnd_res__row_decoder					row_decoder;
@@ -740,7 +741,7 @@ typedef zend_ulong *		(*func_mysqlnd_result_buffered__fetch_lengths)(MYSQLND_RES
 typedef enum_func_status	(*func_mysqlnd_result_buffered__data_seek)(MYSQLND_RES_BUFFERED * const result, const uint64_t row);
 typedef void				(*func_mysqlnd_result_buffered__free_result)(MYSQLND_RES_BUFFERED * const result);
 
-MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_result_buffered)
+MYSQLND_CLASS_METHODS_TYPE(mysqlnd_result_buffered)
 {
 	mysqlnd_fetch_row_func						fetch_row;
 	func_mysqlnd_res__row_decoder				row_decoder;
@@ -761,7 +762,7 @@ typedef enum_func_status		(*func_mysqlnd_res_meta__read_metadata)(MYSQLND_RES_ME
 typedef MYSQLND_RES_METADATA *	(*func_mysqlnd_res_meta__clone_metadata)(const MYSQLND_RES_METADATA * const meta, zend_bool persistent);
 typedef void					(*func_mysqlnd_res_meta__free_metadata)(MYSQLND_RES_METADATA * meta);
 
-MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_res_meta)
+MYSQLND_CLASS_METHODS_TYPE(mysqlnd_res_meta)
 {
 	func_mysqlnd_res_meta__fetch_field fetch_field;
 	func_mysqlnd_res_meta__fetch_field_direct fetch_field_direct;
@@ -818,7 +819,7 @@ typedef void 				(*func_mysqlnd_stmt__free_stmt_content)(MYSQLND_STMT * const s)
 typedef enum_func_status	(*func_mysqlnd_stmt__flush)(MYSQLND_STMT * const stmt);
 typedef void 				(*func_mysqlnd_stmt__free_stmt_result)(MYSQLND_STMT * const s);
 
-MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_stmt)
+MYSQLND_CLASS_METHODS_TYPE(mysqlnd_stmt)
 {
 	func_mysqlnd_stmt__prepare prepare;
 	func_mysqlnd_stmt__send_execute send_execute;
@@ -894,7 +895,7 @@ struct st_mysqlnd_net_data
 
 	zend_bool			persistent;
 
-	MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_net) m;
+	MYSQLND_CLASS_METHODS_TYPE(mysqlnd_net) m;
 };
 
 
@@ -923,7 +924,7 @@ struct st_mysqlnd_protocol_payload_decoder_factory
 {
 	MYSQLND_CONN_DATA * conn;
 	zend_bool persistent;
-	MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_protocol_payload_decoder_factory) m;
+	MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_payload_decoder_factory) m;
 };
 
 
@@ -1013,10 +1014,10 @@ struct st_mysqlnd_connection_data
 	zend_bool		in_async_read_cb;
 	zend_bool		in_async_err_cb;
 
-	MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_object_factory) object_factory;
+	MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory) object_factory;
 	func_mysqlnd__command_factory command_factory;
 
-	MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_conn_data) * m;
+	MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data) * m;
 
 	/* persistent connection */
 	zend_bool		persistent;
@@ -1027,7 +1028,7 @@ struct st_mysqlnd_connection
 {
 	MYSQLND_CONN_DATA * data;
 	zend_bool persistent;
-	MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_conn) * m;
+	MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn) * m;
 };
 
 
@@ -1043,7 +1044,7 @@ struct st_mysqlnd_result_metadata
 	MYSQLND_FIELD					*fields;
 	struct mysqlnd_field_hash_key	*zend_hash_keys;
 
-	MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_res_meta) * m;
+	MYSQLND_CLASS_METHODS_TYPE(mysqlnd_res_meta) * m;
 
 	size_t							bit_fields_total_len; /* trailing \0 not counted */
 	/* We need this to make fast allocs in rowp_read */
@@ -1073,7 +1074,7 @@ struct st_mysqlnd_result_metadata
 	unsigned int		field_count;				\
 	zend_bool			ps;							\
 	zend_bool			persistent;					\
-	MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_result_buffered) m;	\
+	MYSQLND_CLASS_METHODS_TYPE(mysqlnd_result_buffered) m;	\
 	enum mysqlnd_buffered_type type;				\
 	void				* unused1;					\
 	void				* unused2;					\
@@ -1106,7 +1107,7 @@ struct st_mysqlnd_buffered_result_c
 
 struct st_mysqlnd_unbuffered_result
 {
-	MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_result_unbuffered) m;
+	MYSQLND_CLASS_METHODS_TYPE(mysqlnd_result_unbuffered) m;
 	uint64_t			row_count;
 
 	/* For unbuffered (both normal and PS) */
@@ -1147,7 +1148,7 @@ struct st_mysqlnd_res
 	MYSQLND_RES_UNBUFFERED	*unbuf;
 
 	zend_bool				persistent;
-	MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_res) m;
+	MYSQLND_CLASS_METHODS_TYPE(mysqlnd_res) m;
 };
 
 
@@ -1206,7 +1207,7 @@ struct st_mysqlnd_stmt_data
 struct st_mysqlnd_stmt
 {
 	MYSQLND_STMT_DATA * data;
-	MYSQLND_CLASS_METHOD_TABLE_NAME_DECL(mysqlnd_stmt) * m;
+	MYSQLND_CLASS_METHODS_TYPE(mysqlnd_stmt) * m;
 	zend_bool persistent;
 };