constify parameters

diff --git a/ext/mysqlnd/mysqlnd_ext_plugin.c b/ext/mysqlnd/mysqlnd_ext_plugin.c
index d739e5ed37692c392af737315f2238841aa97768..b48cf033e3889a3c35567c0b0d7e2feab10a1b86 100644 (file)
--- a/ext/mysqlnd/mysqlnd_ext_plugin.c
+++ b/ext/mysqlnd/mysqlnd_ext_plugin.c
@@ -30,7 +30,7 @@ static struct st_mysqlnd_stmt_methods * mysqlnd_stmt_methods;
 
 /* {{{ mysqlnd_plugin__get_plugin_connection_data */
 static void **
-mysqlnd_plugin__get_plugin_connection_data(const MYSQLND * conn, unsigned int plugin_id)
+mysqlnd_plugin__get_plugin_connection_data(const MYSQLND * conn, const unsigned int plugin_id)
 {
        DBG_ENTER("mysqlnd_plugin__get_plugin_connection_data");
        DBG_INF_FMT("plugin_id=%u", plugin_id);
@@ -44,7 +44,7 @@ mysqlnd_plugin__get_plugin_connection_data(const MYSQLND * conn, unsigned int pl
 
 /* {{{ mysqlnd_plugin__get_plugin_connection_data_data */
 static void **
-mysqlnd_plugin__get_plugin_connection_data_data(const MYSQLND_CONN_DATA * conn, unsigned int plugin_id)
+mysqlnd_plugin__get_plugin_connection_data_data(const MYSQLND_CONN_DATA * conn, const unsigned int plugin_id)
 {
        DBG_ENTER("mysqlnd_plugin__get_plugin_connection_data_data");
        DBG_INF_FMT("plugin_id=%u", plugin_id);
@@ -58,7 +58,7 @@ mysqlnd_plugin__get_plugin_connection_data_data(const MYSQLND_CONN_DATA * conn,
 
 /* {{{ mysqlnd_plugin__get_plugin_result_data */
 static void **
-mysqlnd_plugin__get_plugin_result_data(const MYSQLND_RES * result, unsigned int plugin_id)
+mysqlnd_plugin__get_plugin_result_data(const MYSQLND_RES * result, const unsigned int plugin_id)
 {
        DBG_ENTER("mysqlnd_plugin__get_plugin_result_data");
        DBG_INF_FMT("plugin_id=%u", plugin_id);
@@ -72,7 +72,7 @@ mysqlnd_plugin__get_plugin_result_data(const MYSQLND_RES * result, unsigned int
 
 /* {{{ _mysqlnd_plugin__get_plugin_result_unbuffered_data */
 static void **
-mysqlnd_plugin__get_plugin_result_unbuffered_data(const MYSQLND_RES_UNBUFFERED * result, unsigned int plugin_id)
+mysqlnd_plugin__get_plugin_result_unbuffered_data(const MYSQLND_RES_UNBUFFERED * result, const unsigned int plugin_id)
 {
        DBG_ENTER("mysqlnd_plugin__get_plugin_result_data");
        DBG_INF_FMT("plugin_id=%u", plugin_id);
@@ -86,7 +86,7 @@ mysqlnd_plugin__get_plugin_result_unbuffered_data(const MYSQLND_RES_UNBUFFERED *
 
 /* {{{ _mysqlnd_plugin__get_plugin_result_buffered_data */
 static void **
-mysqlnd_plugin__get_plugin_result_buffered_data_zval(const MYSQLND_RES_BUFFERED_ZVAL * result, unsigned int plugin_id)
+mysqlnd_plugin__get_plugin_result_buffered_data_zval(const MYSQLND_RES_BUFFERED_ZVAL * result, const unsigned int plugin_id)
 {
        DBG_ENTER("_mysqlnd_plugin__get_plugin_result_data");
        DBG_INF_FMT("plugin_id=%u", plugin_id);
@@ -99,7 +99,7 @@ mysqlnd_plugin__get_plugin_result_buffered_data_zval(const MYSQLND_RES_BUFFERED_
 
 /* {{{ mysqlnd_plugin__get_plugin_result_buffered_data */
 static void **
-mysqlnd_plugin__get_plugin_result_buffered_data_c(const MYSQLND_RES_BUFFERED_C * result, unsigned int plugin_id)
+mysqlnd_plugin__get_plugin_result_buffered_data_c(const MYSQLND_RES_BUFFERED_C * result, const unsigned int plugin_id)
 {
        DBG_ENTER("mysqlnd_plugin__get_plugin_result_data");
        DBG_INF_FMT("plugin_id=%u", plugin_id);
@@ -113,7 +113,7 @@ mysqlnd_plugin__get_plugin_result_buffered_data_c(const MYSQLND_RES_BUFFERED_C *
 
 /* {{{ mysqlnd_plugin__get_plugin_protocol_data */
 static void **
-mysqlnd_plugin__get_plugin_protocol_data(const MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * factory, unsigned int plugin_id)
+mysqlnd_plugin__get_plugin_protocol_data(const MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * factory, const unsigned int plugin_id)
 {
        DBG_ENTER("mysqlnd_plugin__get_plugin_protocol_data");
        DBG_INF_FMT("plugin_id=%u", plugin_id);
@@ -127,7 +127,7 @@ mysqlnd_plugin__get_plugin_protocol_data(const MYSQLND_PROTOCOL_PAYLOAD_DECODER_
 
 /* {{{ mysqlnd_plugin__get_plugin_stmt_data */
 static void **
-mysqlnd_plugin__get_plugin_stmt_data(const MYSQLND_STMT * stmt, unsigned int plugin_id)
+mysqlnd_plugin__get_plugin_stmt_data(const MYSQLND_STMT * stmt, const unsigned int plugin_id)
 {
        DBG_ENTER("mysqlnd_plugin__get_plugin_stmt_data");
        DBG_INF_FMT("plugin_id=%u", plugin_id);
@@ -141,7 +141,7 @@ mysqlnd_plugin__get_plugin_stmt_data(const MYSQLND_STMT * stmt, unsigned int plu
 
 /* {{{ mysqlnd_plugin__get_plugin_pfc_data */
 static void **
-mysqlnd_plugin__get_plugin_pfc_data(const MYSQLND_PFC * pfc, unsigned int plugin_id)
+mysqlnd_plugin__get_plugin_pfc_data(const MYSQLND_PFC * pfc, const unsigned int plugin_id)
 {
        DBG_ENTER("mysqlnd_plugin__get_plugin_pfc_data");
        DBG_INF_FMT("plugin_id=%u", plugin_id);
@@ -155,7 +155,7 @@ mysqlnd_plugin__get_plugin_pfc_data(const MYSQLND_PFC * pfc, unsigned int plugin
 
 /* {{{ _mysqlnd_plugin__get_plugin_vio_data */
 static void **
-mysqlnd_plugin__get_plugin_vio_data(const MYSQLND_VIO * vio, unsigned int plugin_id)
+mysqlnd_plugin__get_plugin_vio_data(const MYSQLND_VIO * vio, const unsigned int plugin_id)
 {
        DBG_ENTER("_mysqlnd_plugin__get_plugin_vio_data");
        DBG_INF_FMT("plugin_id=%u", plugin_id);

diff --git a/ext/mysqlnd/mysqlnd_ext_plugin.h b/ext/mysqlnd/mysqlnd_ext_plugin.h
index 5ed0071223089b102d6098c68702f171fbcb9239..a7f99ef58871da8b55e42b758a16958cbe9d88e1 100644 (file)
--- a/ext/mysqlnd/mysqlnd_ext_plugin.h
+++ b/ext/mysqlnd/mysqlnd_ext_plugin.h
@@ -21,16 +21,16 @@
 
 struct st_mysqlnd_plugin__plugin_area_getters
 {
-       void ** (*get_connection_area)(const MYSQLND * conn, unsigned int plugin_id);
-       void ** (*get_connection_data_area)(const MYSQLND_CONN_DATA * conn, unsigned int plugin_id);
-       void ** (*get_result_area)(const MYSQLND_RES * result, unsigned int plugin_id);
-       void ** (*get_unbuffered_area)(const MYSQLND_RES_UNBUFFERED * result, unsigned int plugin_id);
-       void ** (*get_result_buffered_area)(const MYSQLND_RES_BUFFERED_ZVAL * result, unsigned int plugin_id);
-       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_pfc_area)(const MYSQLND_PFC * pfc, unsigned int plugin_id);
-       void ** (*get_vio_area)(const MYSQLND_VIO * vio, unsigned int plugin_id);
+       void ** (*get_connection_area)(const MYSQLND * conn, const unsigned int plugin_id);
+       void ** (*get_connection_data_area)(const MYSQLND_CONN_DATA * conn, const unsigned int plugin_id);
+       void ** (*get_result_area)(const MYSQLND_RES * result, const unsigned int plugin_id);
+       void ** (*get_unbuffered_area)(const MYSQLND_RES_UNBUFFERED * result, const unsigned int plugin_id);
+       void ** (*get_result_buffered_area)(const MYSQLND_RES_BUFFERED_ZVAL * result, const unsigned int plugin_id);
+       void ** (*get_result_buffered_aread_c)(const MYSQLND_RES_BUFFERED_C * result, const unsigned int plugin_id);
+       void ** (*get_stmt_area)(const MYSQLND_STMT * stmt, const unsigned int plugin_id);
+       void ** (*get_protocol_decoder_area)(const MYSQLND_PROTOCOL_PAYLOAD_DECODER_FACTORY * factory, const unsigned int plugin_id);
+       void ** (*get_pfc_area)(const MYSQLND_PFC * pfc, const unsigned int plugin_id);
+       void ** (*get_vio_area)(const MYSQLND_VIO * vio, const unsigned int plugin_id);
 };
 
 extern struct st_mysqlnd_plugin__plugin_area_getters mysqlnd_plugin_area_getters;

diff --git a/ext/mysqlnd/mysqlnd_protocol_frame_codec.c b/ext/mysqlnd/mysqlnd_protocol_frame_codec.c
index 077d32c1418afd277a07427df0dfada9f0420df8..092380038f566b9b35f734375188f46b17713ea3 100644 (file)
--- a/ext/mysqlnd/mysqlnd_protocol_frame_codec.c
+++ b/ext/mysqlnd/mysqlnd_protocol_frame_codec.c
@@ -473,7 +473,7 @@ MYSQLND_CLASS_METHODS_END;
 
 /* {{{ mysqlnd_pfc_init */
 PHPAPI MYSQLND_PFC *
-mysqlnd_pfc_init(zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info)
+mysqlnd_pfc_init(const zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info)
 {
        MYSQLND_PFC * pfc;
        DBG_ENTER("mysqlnd_pfc_init");

diff --git a/ext/mysqlnd/mysqlnd_protocol_frame_codec.h b/ext/mysqlnd/mysqlnd_protocol_frame_codec.h
index 4e40f4a74c8c3ab87696db3461cc9cd1c38aa7e1..49bb8da9e532d0c3b0de99250c134dbe329c0a61 100644 (file)
--- a/ext/mysqlnd/mysqlnd_protocol_frame_codec.h
+++ b/ext/mysqlnd/mysqlnd_protocol_frame_codec.h
@@ -20,7 +20,7 @@
 #ifndef MYSQLND_PROTOCOL_FRAME_CODEC_H
 #define MYSQLND_PROTOCOL_FRAME_CODEC_H
 
-PHPAPI MYSQLND_PFC * mysqlnd_pfc_init(zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info);
+PHPAPI MYSQLND_PFC * mysqlnd_pfc_init(const zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info);
 PHPAPI void mysqlnd_pfc_free(MYSQLND_PFC * const net, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info);
 
 #endif /* MYSQLND_PROTOCOL_FRAME_CODEC_H */