com php-src: Rename from previous acronym (ppec became pfc): ext/mysqlnd/mysqlnd_ext_plugin.c ext/mysqlnd/mysqlnd_ ext_plugin.h
| From: | Andrey Hristov | Date: | Tue, 17 Nov 2015 13:40:03 +0000 |
| Subject: | com php-src: Rename from previous acronym (ppec became pfc): ext/mysqlnd/mysqlnd_ext_plugin.c ext/mysqlnd/mysqlnd_ ext_plugin.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89882@lists.php.net to get a copy of this message | ||
Commit: 43bfbd86d9ff726acddcee2aa3f4a54acc0a6a45
Author: Andrey Hristov <andrey@php.net> Tue, 17 Nov 2015 14:40:03 +0100
Parents: fae994fed9d7e74f3688f4860839a2ce0b2f71e3
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=43bfbd86d9ff726acddcee2aa3f4a54acc0a6a45
Log:
Rename from previous acronym (ppec became pfc)
Changed paths:
M ext/mysqlnd/mysqlnd_ext_plugin.c
M ext/mysqlnd/mysqlnd_ext_plugin.h
Diff:
diff --git a/ext/mysqlnd/mysqlnd_ext_plugin.c b/ext/mysqlnd/mysqlnd_ext_plugin.c
index 7871948..d739e5e 100644
--- a/ext/mysqlnd/mysqlnd_ext_plugin.c
+++ b/ext/mysqlnd/mysqlnd_ext_plugin.c
@@ -139,16 +139,16 @@ mysqlnd_plugin__get_plugin_stmt_data(const MYSQLND_STMT * stmt, unsigned int
plu
/* }}} */
-/* {{{ mysqlnd_plugin__get_plugin_ppec_data */
+/* {{{ mysqlnd_plugin__get_plugin_pfc_data */
static void **
-mysqlnd_plugin__get_plugin_ppec_data(const MYSQLND_PFC * ppec, unsigned int plugin_id)
+mysqlnd_plugin__get_plugin_pfc_data(const MYSQLND_PFC * pfc, unsigned int plugin_id)
{
- DBG_ENTER("mysqlnd_plugin__get_plugin_ppec_data");
+ DBG_ENTER("mysqlnd_plugin__get_plugin_pfc_data");
DBG_INF_FMT("plugin_id=%u", plugin_id);
- if (!ppec || plugin_id >= mysqlnd_plugin_count()) {
+ if (!pfc || plugin_id >= mysqlnd_plugin_count()) {
return NULL;
}
- DBG_RETURN((void *)((char *)ppec + sizeof(MYSQLND_PFC) + plugin_id * sizeof(void *)));
+ DBG_RETURN((void *)((char *)pfc + sizeof(MYSQLND_PFC) + plugin_id * sizeof(void *)));
}
/* }}} */
@@ -176,7 +176,7 @@ struct st_mysqlnd_plugin__plugin_area_getters mysqlnd_plugin_area_getters =
mysqlnd_plugin__get_plugin_result_buffered_data_c,
mysqlnd_plugin__get_plugin_stmt_data,
mysqlnd_plugin__get_plugin_protocol_data,
- mysqlnd_plugin__get_plugin_ppec_data,
+ mysqlnd_plugin__get_plugin_pfc_data,
mysqlnd_plugin__get_plugin_vio_data,
};
diff --git a/ext/mysqlnd/mysqlnd_ext_plugin.h b/ext/mysqlnd/mysqlnd_ext_plugin.h
index 4f6d296..5ed0071 100644
--- a/ext/mysqlnd/mysqlnd_ext_plugin.h
+++ b/ext/mysqlnd/mysqlnd_ext_plugin.h
@@ -29,7 +29,7 @@ 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_ppec_area)(const MYSQLND_PFC * ppec, unsigned int plugin_id);
+ void ** (*get_pfc_area)(const MYSQLND_PFC * pfc, unsigned int plugin_id);
void ** (*get_vio_area)(const MYSQLND_VIO * vio, unsigned int plugin_id);
};
@@ -43,8 +43,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_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))
+#define mysqlnd_plugin_get_plugin_pfc_data(pfc,
p_id) mysqlnd_plugin_area_getters.get_pfc_area((pfc), (p_id))
+#define mysqlnd_plugin_get_plugin_vio_data(vio,
p_id) mysqlnd_plugin_area_getters.get_pfc_area((vio), (p_id))
struct st_mysqlnd_plugin_methods_xetters
@@ -97,11 +97,11 @@ struct st_mysqlnd_plugin_methods_xetters
void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_payload_decoder_factory) *methods);
} protocol;
- struct st_mnd_ppec_xetters
+ struct st_mnd_pfc_xetters
{
MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_frame_codec) * (*get)();
void (*set)(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_protocol_packet_frame_codec) * methods);
- } ppec;
+ } pfc;
struct st_mnd_vio_xetters
{
@@ -149,8 +149,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_pfc_get_methods() mysqlnd_plugin_methods_xetters.ppec.get()
-#define mysqlnd_pfc_set_methods(m) mysqlnd_plugin_methods_xetters.ppec.set((m))
+#define mysqlnd_pfc_get_methods() mysqlnd_plugin_methods_xetters.pfc.get()
+#define mysqlnd_pfc_set_methods(m) mysqlnd_plugin_methods_xetters.pfc.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))