Skip to content

Commit e9bccff

Browse files
faizshukrifaizshukri
committed
MNDR:
- switch to macro generation of structure names for the methods
1 parent 3eee292 commit e9bccff

File tree

5 files changed

+124
-91
lines changed

5 files changed

+124
-91
lines changed

‎ext/mysqlnd/mysqlnd.c

+32-31
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include "mysqlnd_statistics.h"
2828
#include "mysqlnd_charset.h"
2929
#include "mysqlnd_debug.h"
30+
#include "mysqlnd_ext_plugin.h"
3031
#include "zend_smart_str.h"
3132

3233

@@ -156,7 +157,7 @@ enum_func_status
156157
mysqlnd_error_info_init(MYSQLND_ERROR_INFO * const info, zend_bool persistent)
157158
{
158159
DBG_ENTER("mysqlnd_error_info_init")
159-
info->m = &MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_error_info);
160+
info->m = mysqlnd_error_info_get_methods();
160161
info->m->reset(info);
161162

162163
info->error_list = mnd_pecalloc(1, sizeof(zend_llist), persistent);
@@ -420,7 +421,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, send_command_handle_response)(
420421
static enum_func_status
421422
MYSQLND_METHOD(mysqlnd_conn_data, set_server_option)(MYSQLND_CONN_DATA * const conn, enum_mysqlnd_server_option option)
422423
{
423-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, set_server_option);
424+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), set_server_option);
424425
enum_func_status ret = FAIL;
425426
DBG_ENTER("mysqlnd_conn_data::set_server_option");
426427
if (PASS == conn->m->local_tx_start(conn, this_func)) {
@@ -843,7 +844,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn,
843844
unsigned int mysql_flags
844845
)
845846
{
846-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, connect);
847+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), connect);
847848
size_t host_len;
848849
zend_bool unix_socket = FALSE;
849850
zend_bool named_pipe = FALSE;
@@ -1094,7 +1095,7 @@ MYSQLND_METHOD(mysqlnd_conn, connect)(MYSQLND * conn_handle,
10941095
unsigned int mysql_flags
10951096
)
10961097
{
1097-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, connect);
1098+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), connect);
10981099
enum_func_status ret = FAIL;
10991100
MYSQLND_CONN_DATA * conn = conn_handle->data;
11001101

@@ -1161,7 +1162,7 @@ PHPAPI MYSQLND * mysqlnd_connection_connect(MYSQLND * conn_handle,
11611162
static enum_func_status
11621163
MYSQLND_METHOD(mysqlnd_conn_data, query)(MYSQLND_CONN_DATA * conn, const char * query, unsigned int query_len)
11631164
{
1164-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, query);
1165+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), query);
11651166
enum_func_status ret = FAIL;
11661167
DBG_ENTER("mysqlnd_conn_data::query");
11671168
DBG_INF_FMT("conn=%p conn=%llu query=%s", conn, conn->thread_id, query);
@@ -1187,7 +1188,7 @@ static enum_func_status
11871188
MYSQLND_METHOD(mysqlnd_conn_data, send_query)(MYSQLND_CONN_DATA * conn, const char * query, unsigned int query_len,
11881189
enum_mysqlnd_send_query_type type, zval *read_cb, zval *err_cb)
11891190
{
1190-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, send_query);
1191+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), send_query);
11911192
enum_func_status ret = FAIL;
11921193
DBG_ENTER("mysqlnd_conn_data::send_query");
11931194
DBG_INF_FMT("conn=%llu query=%s", conn->thread_id, query);
@@ -1216,7 +1217,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, send_query)(MYSQLND_CONN_DATA * conn, const ch
12161217
static enum_func_status
12171218
MYSQLND_METHOD(mysqlnd_conn_data, reap_query)(MYSQLND_CONN_DATA * conn, enum_mysqlnd_reap_result_type type)
12181219
{
1219-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, reap_query);
1220+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), reap_query);
12201221
enum_func_status ret = FAIL;
12211222
DBG_ENTER("mysqlnd_conn_data::reap_query");
12221223
DBG_INF_FMT("conn=%llu", conn->thread_id);
@@ -1441,7 +1442,7 @@ mysqlnd_poll(MYSQLND **r_array, MYSQLND **e_array, MYSQLND ***dont_poll, long se
14411442
MYSQLND_RES *
14421443
MYSQLND_METHOD(mysqlnd_conn_data, list_fields)(MYSQLND_CONN_DATA * conn, const char *table, const char *achtung_wild)
14431444
{
1444-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, list_fields);
1445+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), list_fields);
14451446
MYSQLND_RES * result = NULL;
14461447
DBG_ENTER("mysqlnd_conn_data::list_fields");
14471448
DBG_INF_FMT("conn=%llu table=%s wild=%s", conn->thread_id, table? table:"",achtung_wild? achtung_wild:"");
@@ -1500,7 +1501,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, list_fields)(MYSQLND_CONN_DATA * conn, const c
15001501
MYSQLND_RES *
15011502
MYSQLND_METHOD(mysqlnd_conn_data, list_method)(MYSQLND_CONN_DATA * conn, const char * query, const char *achtung_wild, char *par1)
15021503
{
1503-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, list_method);
1504+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), list_method);
15041505
char * show_query = NULL;
15051506
size_t show_query_len;
15061507
MYSQLND_RES * result = NULL;
@@ -1578,7 +1579,7 @@ static enum_func_status
15781579
MYSQLND_METHOD(mysqlnd_conn_data, ssl_set)(MYSQLND_CONN_DATA * const conn, const char * key, const char * const cert,
15791580
const char * const ca, const char * const capath, const char * const cipher)
15801581
{
1581-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, ssl_set);
1582+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), ssl_set);
15821583
enum_func_status ret = FAIL;
15831584
MYSQLND_NET * net = conn->net;
15841585
DBG_ENTER("mysqlnd_conn_data::ssl_set");
@@ -1601,7 +1602,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, ssl_set)(MYSQLND_CONN_DATA * const conn, const
16011602
static zend_ulong
16021603
MYSQLND_METHOD(mysqlnd_conn_data, escape_string)(MYSQLND_CONN_DATA * const conn, char * newstr, const char * escapestr, size_t escapestr_len)
16031604
{
1604-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, escape_string);
1605+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), escape_string);
16051606
zend_ulong ret = FAIL;
16061607
DBG_ENTER("mysqlnd_conn_data::escape_string");
16071608
DBG_INF_FMT("conn=%llu", conn->thread_id);
@@ -1624,7 +1625,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, escape_string)(MYSQLND_CONN_DATA * const conn,
16241625
static enum_func_status
16251626
MYSQLND_METHOD(mysqlnd_conn_data, dump_debug_info)(MYSQLND_CONN_DATA * const conn)
16261627
{
1627-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, server_dump_debug_information);
1628+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), server_dump_debug_information);
16281629
enum_func_status ret = FAIL;
16291630
DBG_ENTER("mysqlnd_conn_data::dump_debug_info");
16301631
DBG_INF_FMT("conn=%llu", conn->thread_id);
@@ -1647,7 +1648,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, dump_debug_info)(MYSQLND_CONN_DATA * const con
16471648
static enum_func_status
16481649
MYSQLND_METHOD(mysqlnd_conn_data, select_db)(MYSQLND_CONN_DATA * const conn, const char * const db, unsigned int db_len)
16491650
{
1650-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, select_db);
1651+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), select_db);
16511652
enum_func_status ret = FAIL;
16521653

16531654
DBG_ENTER("mysqlnd_conn_data::select_db");
@@ -1689,7 +1690,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, select_db)(MYSQLND_CONN_DATA * const conn, con
16891690
static enum_func_status
16901691
MYSQLND_METHOD(mysqlnd_conn_data, ping)(MYSQLND_CONN_DATA * const conn)
16911692
{
1692-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, ping);
1693+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), ping);
16931694
enum_func_status ret = FAIL;
16941695

16951696
DBG_ENTER("mysqlnd_conn_data::ping");
@@ -1719,7 +1720,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, ping)(MYSQLND_CONN_DATA * const conn)
17191720
static enum_func_status
17201721
MYSQLND_METHOD(mysqlnd_conn_data, statistic)(MYSQLND_CONN_DATA * conn, zend_string **message)
17211722
{
1722-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, get_server_statistics);
1723+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), get_server_statistics);
17231724
enum_func_status ret = FAIL;
17241725
MYSQLND_PACKET_STATS * stats_header;
17251726

@@ -1762,7 +1763,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, statistic)(MYSQLND_CONN_DATA * conn, zend_stri
17621763
static enum_func_status
17631764
MYSQLND_METHOD(mysqlnd_conn_data, kill)(MYSQLND_CONN_DATA * conn, unsigned int pid)
17641765
{
1765-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, kill_connection);
1766+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), kill_connection);
17661767
enum_func_status ret = FAIL;
17671768

17681769
DBG_ENTER("mysqlnd_conn_data::kill");
@@ -1798,7 +1799,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, kill)(MYSQLND_CONN_DATA * conn, unsigned int p
17981799
static enum_func_status
17991800
MYSQLND_METHOD(mysqlnd_conn_data, set_charset)(MYSQLND_CONN_DATA * const conn, const char * const csname)
18001801
{
1801-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, set_charset);
1802+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), set_charset);
18021803
enum_func_status ret = FAIL;
18031804
const MYSQLND_CHARSET * const charset = mysqlnd_find_charset_name(csname);
18041805

@@ -1837,7 +1838,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, set_charset)(MYSQLND_CONN_DATA * const conn, c
18371838
static enum_func_status
18381839
MYSQLND_METHOD(mysqlnd_conn_data, refresh)(MYSQLND_CONN_DATA * const conn, uint8_t options)
18391840
{
1840-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, refresh_server);
1841+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), refresh_server);
18411842
enum_func_status ret = FAIL;
18421843
DBG_ENTER("mysqlnd_conn_data::refresh");
18431844
DBG_INF_FMT("conn=%llu options=%lu", conn->thread_id, options);
@@ -1859,7 +1860,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, refresh)(MYSQLND_CONN_DATA * const conn, uint8
18591860
static enum_func_status
18601861
MYSQLND_METHOD(mysqlnd_conn_data, shutdown)(MYSQLND_CONN_DATA * const conn, uint8_t level)
18611862
{
1862-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, shutdown_server);
1863+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), shutdown_server);
18631864
enum_func_status ret = FAIL;
18641865
DBG_ENTER("mysqlnd_conn_data::shutdown");
18651866
DBG_INF_FMT("conn=%llu level=%lu", conn->thread_id, level);
@@ -2152,7 +2153,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, more_results)(const MYSQLND_CONN_DATA * const
21522153
static enum_func_status
21532154
MYSQLND_METHOD(mysqlnd_conn_data, next_result)(MYSQLND_CONN_DATA * const conn)
21542155
{
2155-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, next_result);
2156+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), next_result);
21562157
enum_func_status ret = FAIL;
21572158

21582159
DBG_ENTER("mysqlnd_conn_data::next_result");
@@ -2260,7 +2261,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, change_user)(MYSQLND_CONN_DATA * const conn,
22602261
size_t passwd_len
22612262
)
22622263
{
2263-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, change_user);
2264+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), change_user);
22642265
enum_func_status ret = FAIL;
22652266

22662267
DBG_ENTER("mysqlnd_conn_data::change_user");
@@ -2308,7 +2309,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, set_client_option)(MYSQLND_CONN_DATA * const c
23082309
const char * const value
23092310
)
23102311
{
2311-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, set_client_option);
2312+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), set_client_option);
23122313
enum_func_status ret = PASS;
23132314
DBG_ENTER("mysqlnd_conn_data::set_client_option");
23142315
DBG_INF_FMT("conn=%llu option=%u", conn->thread_id, option);
@@ -2479,7 +2480,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, set_client_option_2d)(MYSQLND_CONN_DATA * cons
24792480
const char * const value
24802481
)
24812482
{
2482-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, set_client_option_2d);
2483+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), set_client_option_2d);
24832484
enum_func_status ret = PASS;
24842485
DBG_ENTER("mysqlnd_conn_data::set_client_option_2d");
24852486
DBG_INF_FMT("conn=%llu option=%u", conn->thread_id, option);
@@ -2522,7 +2523,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, set_client_option_2d)(MYSQLND_CONN_DATA * cons
25222523
static MYSQLND_RES *
25232524
MYSQLND_METHOD(mysqlnd_conn_data, use_result)(MYSQLND_CONN_DATA * const conn, const unsigned int flags)
25242525
{
2525-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, use_result);
2526+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), use_result);
25262527
MYSQLND_RES * result = NULL;
25272528

25282529
DBG_ENTER("mysqlnd_conn_data::use_result");
@@ -2564,7 +2565,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, use_result)(MYSQLND_CONN_DATA * const conn, co
25642565
static MYSQLND_RES *
25652566
MYSQLND_METHOD(mysqlnd_conn_data, store_result)(MYSQLND_CONN_DATA * const conn, const unsigned int flags)
25662567
{
2567-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, store_result);
2568+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), store_result);
25682569
MYSQLND_RES * result = NULL;
25692570

25702571
DBG_ENTER("mysqlnd_conn_data::store_result");
@@ -2633,7 +2634,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_connection_stats)(const MYSQLND_CONN_DATA
26332634
static enum_func_status
26342635
MYSQLND_METHOD(mysqlnd_conn_data, set_autocommit)(MYSQLND_CONN_DATA * conn, unsigned int mode)
26352636
{
2636-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, set_autocommit);
2637+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), set_autocommit);
26372638
enum_func_status ret = FAIL;
26382639
DBG_ENTER("mysqlnd_conn_data::set_autocommit");
26392640

@@ -2744,7 +2745,7 @@ mysqlnd_escape_string_for_tx_name_in_comment(const char * const name)
27442745
static enum_func_status
27452746
MYSQLND_METHOD(mysqlnd_conn_data, tx_commit_or_rollback)(MYSQLND_CONN_DATA * conn, const zend_bool commit, const unsigned int flags, const char * const name)
27462747
{
2747-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, tx_commit_or_rollback);
2748+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), tx_commit_or_rollback);
27482749
enum_func_status ret = FAIL;
27492750
DBG_ENTER("mysqlnd_conn_data::tx_commit_or_rollback");
27502751

@@ -2788,7 +2789,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_commit_or_rollback)(MYSQLND_CONN_DATA * con
27882789
static enum_func_status
27892790
MYSQLND_METHOD(mysqlnd_conn_data, tx_begin)(MYSQLND_CONN_DATA * conn, const unsigned int mode, const char * const name)
27902791
{
2791-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, tx_begin);
2792+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), tx_begin);
27922793
enum_func_status ret = FAIL;
27932794
DBG_ENTER("mysqlnd_conn_data::tx_begin");
27942795

@@ -2850,7 +2851,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_begin)(MYSQLND_CONN_DATA * conn, const unsi
28502851
static enum_func_status
28512852
MYSQLND_METHOD(mysqlnd_conn_data, tx_savepoint)(MYSQLND_CONN_DATA * conn, const char * const name)
28522853
{
2853-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, tx_savepoint);
2854+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), tx_savepoint);
28542855
enum_func_status ret = FAIL;
28552856
DBG_ENTER("mysqlnd_conn_data::tx_savepoint");
28562857

@@ -2882,7 +2883,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, tx_savepoint)(MYSQLND_CONN_DATA * conn, const
28822883
static enum_func_status
28832884
MYSQLND_METHOD(mysqlnd_conn_data, tx_savepoint_release)(MYSQLND_CONN_DATA * conn, const char * const name)
28842885
{
2885-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_data_methods, tx_savepoint_release);
2886+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data), tx_savepoint_release);
28862887
enum_func_status ret = FAIL;
28872888
DBG_ENTER("mysqlnd_conn_data::tx_savepoint_release");
28882889

@@ -3094,7 +3095,7 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_conn, dtor)(MYSQLND * conn)
30943095
static enum_func_status
30953096
MYSQLND_METHOD(mysqlnd_conn, close)(MYSQLND * conn_handle, enum_connection_close_type close_type)
30963097
{
3097-
const size_t this_func = STRUCT_OFFSET(struct st_mysqlnd_conn_methods, close);
3098+
const size_t this_func = STRUCT_OFFSET(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn), close);
30983099
MYSQLND_CONN_DATA * conn = conn_handle->data;
30993100
enum_func_status ret = FAIL;
31003101

0 commit comments

Comments
 (0)