diff options
| author | Andrey Hristov <andrey@php.net> | 2015-11-10 11:02:33 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2015-11-12 16:19:16 +0100 |
| commit | 654d1a7caf068c67560fd49c86cf6f6354322d6f (patch) | |
| tree | 731e7dddb2d0fa79a66ddf194c1e1fdca924460e /ext/mysqlnd/mysqlnd_ext_plugin.h | |
| parent | 80d59a3a362052cfa5767f99dcd3954182947c55 (diff) | |
| download | php-git-654d1a7caf068c67560fd49c86cf6f6354322d6f.tar.gz | |
MNDR:
- rename MYSQLND_NET to MYSQLND_PPEC (protocol packet envelope codec).
PPEC does only the encoding and decoding to the protocol frame.
Diffstat (limited to 'ext/mysqlnd/mysqlnd_ext_plugin.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_ext_plugin.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/ext/mysqlnd/mysqlnd_ext_plugin.h b/ext/mysqlnd/mysqlnd_ext_plugin.h index 2808cb984d..780517f5b1 100644 --- a/ext/mysqlnd/mysqlnd_ext_plugin.h +++ b/ext/mysqlnd/mysqlnd_ext_plugin.h @@ -31,7 +31,8 @@ struct st_mysqlnd_plugin__plugin_area_getters void ** (*get_result_buffered_aread_c)(const MYSQLND_RES_BUFFERED_C * result, unsigned int plugin_id); void ** (*get_stmt_area)(const MYSQLND_STMT * stmt, unsigned int plugin_id); void ** (*get_protocol_decoder_area)(const MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * factory, unsigned int plugin_id); - void ** (*get_net_area)(const MYSQLND_NET * net, unsigned int plugin_id); + void ** (*get_ppec_area)(const MYSQLND_PPEC * ppec, unsigned int plugin_id); + void ** (*get_vio_area)(const MYSQLND_VIO * vio, unsigned int plugin_id); }; extern struct st_mysqlnd_plugin__plugin_area_getters mysqlnd_plugin_area_getters; @@ -44,7 +45,8 @@ extern struct st_mysqlnd_plugin__plugin_area_getters mysqlnd_plugin_area_getters #define mysqlnd_plugin_get_plugin_result_buffered_data_c(res, p_id) mysqlnd_plugin_area_getters.get_result_buffered_aread_c((res), (p_id)) #define mysqlnd_plugin_get_plugin_stmt_data(stmt, p_id) mysqlnd_plugin_area_getters.get_stmt_area((stmt), (p_id)) #define mysqlnd_plugin_get_plugin_protocol_data(proto, p_id) mysqlnd_plugin_area_getters.get_protocol_decoder_area((proto), (p_id)) -#define mysqlnd_plugin_get_plugin_net_data(net, p_id) mysqlnd_plugin_area_getters.get_net_area((net), (p_id)) +#define mysqlnd_plugin_get_plugin_ppec_data(ppec, p_id) mysqlnd_plugin_area_getters.get_ppec_area((ppec), (p_id)) +#define mysqlnd_plugin_get_plugin_vio_data(vio, p_id) mysqlnd_plugin_area_getters.get_ppec_area((vio), (p_id)) struct st_mysqlnd_plugin_methods_xetters @@ -97,11 +99,11 @@ struct st_mysqlnd_plugin_methods_xetters void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_payload_decoder_factory) *methods); } protocol; - struct st_mnd_net_xetters + struct st_mnd_ppec_xetters { - MYSQLND_CLASS_METHODS_TYPE(mysqlnd_net) * (*get)(); - void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_net) * methods); - } net; + MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_envelope_codec) * (*get)(); + void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_envelope_codec) * methods); + } ppec; struct st_mnd_vio_xetters { @@ -149,8 +151,8 @@ extern struct st_mysqlnd_plugin_methods_xetters mysqlnd_plugin_methods_xetters; #define mysqlnd_protocol_get_methods() mysqlnd_plugin_methods_xetters.protocol.get() #define mysqlnd_protocol_set_methods(m) mysqlnd_plugin_methods_xetters.protocol.set((m)) -#define mysqlnd_net_get_methods() mysqlnd_plugin_methods_xetters.net.get() -#define mysqlnd_net_set_methods(m) mysqlnd_plugin_methods_xetters.net.set((m)) +#define mysqlnd_ppec_get_methods() mysqlnd_plugin_methods_xetters.ppec.get() +#define mysqlnd_ppec_set_methods(m) mysqlnd_plugin_methods_xetters.ppec.set((m)) #define mysqlnd_vio_get_methods() mysqlnd_plugin_methods_xetters.vio.get() #define mysqlnd_vio_set_methods(m) mysqlnd_plugin_methods_xetters.vio.set((m)) |