com php-src: Bring consistency to the class by renaming the methods too (from the old temporary name): ext/mysqlnd/mysqlnd_ext_plug in.c
ext/mysqlnd/mysqlnd_ext_plugin.h ext/mysqlnd/m ysqlnd_priv.h ext/mysqlnd/mysqlnd_protocol_frame_co dec.c ext/mysqlnd/mysqlnd_structs.h
| From: | Andrey Hristov | Date: | Tue, 17 Nov 2015 12:28:47 +0000 |
| Subject: | com php-src: Bring consistency to the class by renaming the methods too (from the old temporary name): ext/mysqlnd/mysqlnd_ext_plug in.c ext/mysqlnd/mysqlnd_ext_plugin.h ext/mysqlnd/m ysqlnd_priv.h ext/mysqlnd/mysqlnd_protocol_frame_co dec.c ext/mysqlnd/mysqlnd_structs.h |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89881@lists.php.net to get a copy of this message | ||
Commit: fae994fed9d7e74f3688f4860839a2ce0b2f71e3
Author: Andrey Hristov <andrey@php.net> Tue, 17 Nov 2015 13:28:47 +0100
Parents: f8c2b459481209c3761a694baa6f38060dc9875a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fae994fed9d7e74f3688f4860839a2ce0b2f71e3
Log:
Bring consistency to the class by renaming the methods too (from the
old temporary name)
Changed paths:
M ext/mysqlnd/mysqlnd_ext_plugin.c
M ext/mysqlnd/mysqlnd_ext_plugin.h
M ext/mysqlnd/mysqlnd_priv.h
M ext/mysqlnd/mysqlnd_protocol_frame_codec.c
M ext/mysqlnd/mysqlnd_structs.h
Diff:
diff --git a/ext/mysqlnd/mysqlnd_ext_plugin.c b/ext/mysqlnd/mysqlnd_ext_plugin.c
index d375daf..7871948 100644
--- a/ext/mysqlnd/mysqlnd_ext_plugin.c
+++ b/ext/mysqlnd/mysqlnd_ext_plugin.c
@@ -324,19 +324,19 @@
_mysqlnd_protocol_payload_decoder_factory_set_methods(MYSQLND_CLASS_METHODS_TYPE
/* {{{ _mysqlnd_pfc_get_methods */
-static MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_envelope_codec) *
+static MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_frame_codec) *
_mysqlnd_pfc_get_methods()
{
- return &MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_protocol_packet_envelope_codec);
+ return &MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_protocol_packet_frame_codec);
}
/* }}} */
/* {{{ _mysqlnd_pfc_set_methods */
static void
-_mysqlnd_pfc_set_methods(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_envelope_codec) *
methods)
+_mysqlnd_pfc_set_methods(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_frame_codec) * methods)
{
- MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_protocol_packet_envelope_codec) = *methods;
+ MYSQLND_CLASS_METHOD_TABLE_NAME(mysqlnd_protocol_packet_frame_codec) = *methods;
}
/* }}} */
diff --git a/ext/mysqlnd/mysqlnd_ext_plugin.h b/ext/mysqlnd/mysqlnd_ext_plugin.h
index 8864e1b..4f6d296 100644
--- a/ext/mysqlnd/mysqlnd_ext_plugin.h
+++ b/ext/mysqlnd/mysqlnd_ext_plugin.h
@@ -99,8 +99,8 @@ struct st_mysqlnd_plugin_methods_xetters
struct st_mnd_ppec_xetters
{
- MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_envelope_codec) * (*get)();
- void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_envelope_codec) * methods);
+ MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_frame_codec) * (*get)();
+ void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_frame_codec) * methods);
} ppec;
struct st_mnd_vio_xetters
diff --git a/ext/mysqlnd/mysqlnd_priv.h b/ext/mysqlnd/mysqlnd_priv.h
index b334577..7e88688 100644
--- a/ext/mysqlnd/mysqlnd_priv.h
+++ b/ext/mysqlnd/mysqlnd_priv.h
@@ -25,7 +25,7 @@ PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_res);
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_result_unbuffered);
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_result_buffered);
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_protocol_payload_decoder_factory);
-PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_protocol_packet_envelope_codec);
+PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_protocol_packet_frame_codec);
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_vio);
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_upsert_status);
PHPAPI extern MYSQLND_CLASS_METHOD_TABLE_NAME_FORWARD(mysqlnd_error_info);
diff --git a/ext/mysqlnd/mysqlnd_protocol_frame_codec..c
b/ext/mysqlnd/mysqlnd_protocol_frame_codec.c
index c6d4b1e..077d32c 100644
--- a/ext/mysqlnd/mysqlnd_protocol_frame_codec.c
+++ b/ext/mysqlnd/mysqlnd_protocol_frame_codec.c
@@ -448,7 +448,7 @@ MYSQLND_METHOD(mysqlnd_pfc, dtor)(MYSQLND_PFC * const pfc, MYSQLND_STATS * const
/* }}} */
-MYSQLND_CLASS_METHODS_START(mysqlnd_protocol_packet_envelope_codec)
+MYSQLND_CLASS_METHODS_START(mysqlnd_protocol_packet_frame_codec)
MYSQLND_METHOD(mysqlnd_pfc, init),
MYSQLND_METHOD(mysqlnd_pfc, dtor),
MYSQLND_METHOD(mysqlnd_pfc, reset),
diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h
index deab023..50f8eb1 100644
--- a/ext/mysqlnd/mysqlnd_structs.h
+++ b/ext/mysqlnd/mysqlnd_structs.h
@@ -1082,7 +1082,7 @@ typedef enum_func_status (*func_mysqlnd_pfc__receive)(MYSQLND_PFC * const pfc,
M
typedef
enum_func_status (*func_mysqlnd_pfc__read_compressed_packet_from_stream_and_fill_read_buffer)(MYSQLND_PFC
* pfc, MYSQLND_VIO * const vio, size_t net_payload_size, MYSQLND_STATS * conn_stats,
MYSQLND_ERROR_INFO * error_info);
typedef void (*func_mysqlnd_pfc__free_contents)(MYSQLND_PFC * pfc);
-MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_envelope_codec)
+MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_frame_codec)
{
func_mysqlnd_pfc__init init;
func_mysqlnd_pfc__dtor dtor;
@@ -1121,7 +1121,7 @@ struct st_mysqlnd_protocol_frame_codec_data
zend_bool persistent;
- MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_envelope_codec) m;
+ MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_frame_codec) m;
};