Skip to content

Commit a990573

Browse files
committed
MNDR:
- some small renaming of methods
1 parent 0d3329f commit a990573

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

ext/mysqlnd/mysqlnd_wireprotocol.c

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2688,9 +2688,9 @@ MYSQLND_METHOD(mysqlnd_protocol, get_sha256_pk_request_response_packet)(MYSQLND_
26882688
/* }}} */
26892689

26902690

2691-
/* {{{ send_command */
2691+
/* {{{ mysqlnd_protocol::send_command */
26922692
static enum_func_status
2693-
mysqlnd_protocol__send_command(
2693+
MYSQLND_METHOD(mysqlnd_protocol, send_command)(
26942694
MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * payload_decoder_factory,
26952695
const enum php_mysqlnd_server_command command,
26962696
const zend_uchar * const arg, const size_t arg_len,
@@ -2705,7 +2705,7 @@ mysqlnd_protocol__send_command(
27052705
{
27062706
enum_func_status ret = PASS;
27072707
MYSQLND_PACKET_COMMAND * cmd_packet = NULL;
2708-
DBG_ENTER("send_command");
2708+
DBG_ENTER("mysqlnd_protocol::send_command");
27092709
DBG_INF_FMT("command=%s silent=%u", mysqlnd_command_to_text[command], silent);
27102710
DBG_INF_FMT("server_status=%u", UPSERT_STATUS_GET_SERVER_STATUS(upsert_status));
27112711
DBG_INF_FMT("sending %u bytes", arg_len + 1); /* + 1 is for the command */
@@ -2757,9 +2757,9 @@ mysqlnd_protocol__send_command(
27572757
/* }}} */
27582758

27592759

2760-
/* {{{ send_command_handle_OK */
2760+
/* {{{ mysqlnd_protocol::send_command_handle_OK */
27612761
static enum_func_status
2762-
mysqlnd_protocol__send_command_handle_OK(
2762+
MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_OK)(
27632763
MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const payload_decoder_factory,
27642764
MYSQLND_ERROR_INFO * const error_info,
27652765
MYSQLND_UPSERT_STATUS * const upsert_status,
@@ -2770,7 +2770,7 @@ mysqlnd_protocol__send_command_handle_OK(
27702770
enum_func_status ret = FAIL;
27712771
MYSQLND_PACKET_OK * ok_response = payload_decoder_factory->m.get_ok_packet(payload_decoder_factory, FALSE);
27722772

2773-
DBG_ENTER("send_command_handle_OK");
2773+
DBG_ENTER("mysqlnd_protocol::send_command_handle_OK");
27742774
if (!ok_response) {
27752775
SET_OOM_ERROR(error_info);
27762776
DBG_RETURN(FAIL);
@@ -2818,17 +2818,17 @@ mysqlnd_protocol__send_command_handle_OK(
28182818
/* }}} */
28192819

28202820

2821-
/* {{{ send_command_handle_EOF */
2821+
/* {{{ mysqlnd_protocol::send_command_handle_EOF */
28222822
static enum_func_status
2823-
mysqlnd_protocol__send_command_handle_EOF(
2823+
MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_EOF)(
28242824
MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const payload_decoder_factory,
28252825
MYSQLND_ERROR_INFO * const error_info,
28262826
MYSQLND_UPSERT_STATUS * const upsert_status)
28272827
{
28282828
enum_func_status ret = FAIL;
28292829
MYSQLND_PACKET_EOF * response = payload_decoder_factory->m.get_eof_packet(payload_decoder_factory, FALSE);
28302830

2831-
DBG_ENTER("send_command_handle_EOF");
2831+
DBG_ENTER("mysqlnd_protocol::send_command_handle_EOF");
28322832

28332833
if (!response) {
28342834
SET_OOM_ERROR(error_info);
@@ -2861,7 +2861,7 @@ mysqlnd_protocol__send_command_handle_EOF(
28612861

28622862
/* {{{ send_command_handle_response */
28632863
static enum_func_status
2864-
mysqlnd_protocol__send_command_handle_response(
2864+
MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_response)(
28652865
MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * payload_decoder_factory,
28662866
const enum mysqlnd_packet_type ok_packet,
28672867
const zend_bool silent,
@@ -2876,7 +2876,7 @@ mysqlnd_protocol__send_command_handle_response(
28762876
{
28772877
enum_func_status ret = FAIL;
28782878

2879-
DBG_ENTER("send_command_handle_response");
2879+
DBG_ENTER("mysqlnd_protocol::send_command_handle_response");
28802880
DBG_INF_FMT("silent=%u packet=%u command=%s", silent, ok_packet, mysqlnd_command_to_text[command]);
28812881

28822882
switch (ok_packet) {
@@ -2918,10 +2918,10 @@ MYSQLND_CLASS_METHODS_START(mysqlnd_protocol_payload_decoder_factory)
29182918
MYSQLND_METHOD(mysqlnd_protocol, get_sha256_pk_request_packet),
29192919
MYSQLND_METHOD(mysqlnd_protocol, get_sha256_pk_request_response_packet),
29202920

2921-
mysqlnd_protocol__send_command,
2922-
mysqlnd_protocol__send_command_handle_response,
2923-
mysqlnd_protocol__send_command_handle_OK,
2924-
mysqlnd_protocol__send_command_handle_EOF,
2921+
MYSQLND_METHOD(mysqlnd_protocol, send_command),
2922+
MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_response),
2923+
MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_OK),
2924+
MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_EOF),
29252925
MYSQLND_CLASS_METHODS_END;
29262926

29272927

0 commit comments

Comments
 (0)