com php-src: MNDR: - some small renaming of methods: ext/mysqlnd/mysqlnd_wireprotocol.c
| From: | Andrey Hristov | Date: | Thu, 12 Nov 2015 15:19:16 +0000 |
| Subject: | com php-src: MNDR: - some small renaming of methods: ext/mysqlnd/mysqlnd_wireprotocol.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89799@lists.php.net to get a copy of this message | ||
Commit: a990573752af7e0743ed4233ae38cd47b3c94fd5
Author: Andrey Hristov <andrey@php.net> Fri, 6 Nov 2015 17:07:18 +0100
Parents: 0d3329fc9310e3f7d9e6e28ee0f3f386e06031d7
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a990573752af7e0743ed4233ae38cd47b3c94fd5
Log:
MNDR:
- some small renaming of methods
Changed paths:
M ext/mysqlnd/mysqlnd_wireprotocol.c
Diff:
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index 041dc07..be40065 100644
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -2688,9 +2688,9 @@ MYSQLND_METHOD(mysqlnd_protocol,
get_sha256_pk_request_response_packet)(MYSQLND_
/* }}} */
-/* {{{ send_command */
+/* {{{ mysqlnd_protocol::send_command */
static enum_func_status
-mysqlnd_protocol__send_command(
+MYSQLND_METHOD(mysqlnd_protocol, send_command)(
MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * payload_decoder_factory,
const enum php_mysqlnd_server_command command,
const zend_uchar * const arg, const size_t arg_len,
@@ -2705,7 +2705,7 @@ mysqlnd_protocol__send_command(
{
enum_func_status ret = PASS;
MYSQLND_PACKET_COMMAND * cmd_packet = NULL;
- DBG_ENTER("send_command");
+ DBG_ENTER("mysqlnd_protocol::send_command");
DBG_INF_FMT("command=%s silent=%u", mysqlnd_command_to_text[command], silent);
DBG_INF_FMT("server_status=%u", UPSERT_STATUS_GET_SERVER_STATUS(upsert_status));
DBG_INF_FMT("sending %u bytes", arg_len + 1); /* + 1 is for the command */
@@ -2757,9 +2757,9 @@ mysqlnd_protocol__send_command(
/* }}} */
-/* {{{ send_command_handle_OK */
+/* {{{ mysqlnd_protocol::send_command_handle_OK */
static enum_func_status
-mysqlnd_protocol__send_command_handle_OK(
+MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_OK)(
MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const payload_decoder_factory,
MYSQLND_ERROR_INFO * const error_info,
MYSQLND_UPSERT_STATUS * const upsert_status,
@@ -2770,7 +2770,7 @@ mysqlnd_protocol__send_command_handle_OK(
enum_func_status ret = FAIL;
MYSQLND_PACKET_OK * ok_response =
payload_decoder_factory->m.get_ok_packet(payload_decoder_factory, FALSE);
- DBG_ENTER("send_command_handle_OK");
+ DBG_ENTER("mysqlnd_protocol::send_command_handle_OK");
if (!ok_response) {
SET_OOM_ERROR(error_info);
DBG_RETURN(FAIL);
@@ -2818,9 +2818,9 @@ end:
/* }}} */
-/* {{{ send_command_handle_EOF */
+/* {{{ mysqlnd_protocol::send_command_handle_EOF */
static enum_func_status
-mysqlnd_protocol__send_command_handle_EOF(
+MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_EOF)(
MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * const payload_decoder_factory,
MYSQLND_ERROR_INFO * const error_info,
MYSQLND_UPSERT_STATUS * const upsert_status)
@@ -2828,7 +2828,7 @@ mysqlnd_protocol__send_command_handle_EOF(
enum_func_status ret = FAIL;
MYSQLND_PACKET_EOF * response =
payload_decoder_factory->m.get_eof_packet(payload_decoder_factory, FALSE);
- DBG_ENTER("send_command_handle_EOF");
+ DBG_ENTER("mysqlnd_protocol::send_command_handle_EOF");
if (!response) {
SET_OOM_ERROR(error_info);
@@ -2861,7 +2861,7 @@ mysqlnd_protocol__send_command_handle_EOF(
/* {{{ send_command_handle_response */
static enum_func_status
-mysqlnd_protocol__send_command_handle_response(
+MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_response)(
MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * payload_decoder_factory,
const enum mysqlnd_packet_type ok_packet,
const zend_bool silent,
@@ -2876,7 +2876,7 @@ mysqlnd_protocol__send_command_handle_response(
{
enum_func_status ret = FAIL;
- DBG_ENTER("send_command_handle_response");
+ DBG_ENTER("mysqlnd_protocol::send_command_handle_response");
DBG_INF_FMT("silent=%u packet=%u command=%s", silent, ok_packet,
mysqlnd_command_to_text[command]);
switch (ok_packet) {
@@ -2918,10 +2918,10 @@ MYSQLND_CLASS_METHODS_START(mysqlnd_protocol_payload_decoder_factory)
MYSQLND_METHOD(mysqlnd_protocol, get_sha256_pk_request_packet),
MYSQLND_METHOD(mysqlnd_protocol, get_sha256_pk_request_response_packet),
- mysqlnd_protocol__send_command,
- mysqlnd_protocol__send_command_handle_response,
- mysqlnd_protocol__send_command_handle_OK,
- mysqlnd_protocol__send_command_handle_EOF,
+ MYSQLND_METHOD(mysqlnd_protocol, send_command),
+ MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_response),
+ MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_OK),
+ MYSQLND_METHOD(mysqlnd_protocol, send_command_handle_EOF),
MYSQLND_CLASS_METHODS_END;