]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4248240)
MNDR:
authorAndrey Hristov <andrey@php.net>
Tue, 10 Nov 2015 12:32:59 +0000 (13:32 +0100)
committerAndrey Hristov <andrey@php.net>
Thu, 12 Nov 2015 15:19:16 +0000 (16:19 +0100)
- remove inclusion of uneeded headers

ext/mysqlnd/mysqlnd_auth.c patch | blob | history
ext/mysqlnd/mysqlnd_charset.c patch | blob | history
ext/mysqlnd/mysqlnd_commands.c patch | blob | history
ext/mysqlnd/mysqlnd_driver.c patch | blob | history
ext/mysqlnd/mysqlnd_loaddata.c patch | blob | history
ext/mysqlnd/mysqlnd_protocol_frame_codec.c patch | blob | history
ext/mysqlnd/mysqlnd_ps_codec.c patch | blob | history
ext/mysqlnd/mysqlnd_vio.c patch | blob | history
ext/mysqlnd/mysqlnd_wireprotocol.c patch | blob | history
ext/mysqlnd/php_mysqlnd.c patch | blob | history

diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c
index ef343ff6d4461d871b74e21ab3bc549872f24328..e7d44becc335c620a7bd52726409d3e7525018e2 100644 (file)
--- a/ext/mysqlnd/mysqlnd_auth.c
+++ b/ext/mysqlnd/mysqlnd_auth.c
@@ -23,7 +23,6 @@
 #include "mysqlnd_structs.h"
 #include "mysqlnd_wireprotocol.h"
 #include "mysqlnd_priv.h"
-#include "mysqlnd_result.h"
 #include "mysqlnd_charset.h"
 #include "mysqlnd_debug.h"
 
diff --git a/ext/mysqlnd/mysqlnd_charset.c b/ext/mysqlnd/mysqlnd_charset.c
index b9f16e27cb8af868e4d55db1ffe8170d3619016a..2bb6fde3d032cf48ae7570382f7fe3e39d010f02 100644 (file)
--- a/ext/mysqlnd/mysqlnd_charset.c
+++ b/ext/mysqlnd/mysqlnd_charset.c
@@ -18,7 +18,6 @@
   +----------------------------------------------------------------------+
 */
 #include "php.h"
-#include "php_globals.h"
 #include "mysqlnd.h"
 #include "mysqlnd_priv.h"
 #include "mysqlnd_debug.h"
diff --git a/ext/mysqlnd/mysqlnd_commands.c b/ext/mysqlnd/mysqlnd_commands.c
index 184f2ae1c91ab4c3453d6cfa7ca07dc154e023d5..9b71f360080bac89a3aa796a11e2ec524a56bef5 100644 (file)
--- a/ext/mysqlnd/mysqlnd_commands.c
+++ b/ext/mysqlnd/mysqlnd_commands.c
@@ -18,14 +18,11 @@
 */
 
 #include "php.h"
-#include "php_globals.h"
 #include "mysqlnd.h"
 #include "mysqlnd_priv.h"
 #include "mysqlnd_wireprotocol.h"
 #include "mysqlnd_statistics.h"
 #include "mysqlnd_debug.h"
-#include "zend_ini.h"
-
 
 
 struct st_mysqlnd_protocol_no_params_command
diff --git a/ext/mysqlnd/mysqlnd_driver.c b/ext/mysqlnd/mysqlnd_driver.c
index beb4bae5cf862c5dcf97913630956ac74cd01f5c..f45ce661bdab90fe817557e64eecd1b776e7c8ef 100644 (file)
--- a/ext/mysqlnd/mysqlnd_driver.c
+++ b/ext/mysqlnd/mysqlnd_driver.c
@@ -24,9 +24,7 @@
 #include "mysqlnd_protocol_frame_codec.h"
 #include "mysqlnd_wireprotocol.h"
 #include "mysqlnd_priv.h"
-#include "mysqlnd_result.h"
 #include "mysqlnd_statistics.h"
-#include "mysqlnd_charset.h"
 #include "mysqlnd_debug.h"
 #include "mysqlnd_reverse_api.h"
 #include "mysqlnd_ext_plugin.h"
@@ -243,37 +241,37 @@ MYSQLND_METHOD(mysqlnd_object_factory, get_prepared_statement)(MYSQLND_CONN_DATA
 /* }}} */
 
 
-/* {{{ mysqlnd_object_factory::get_ppec */
+/* {{{ mysqlnd_object_factory::get_pfc */
 static MYSQLND_PFC *
-MYSQLND_METHOD(mysqlnd_object_factory, get_ppec)(zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info)
+MYSQLND_METHOD(mysqlnd_object_factory, get_pfc)(zend_bool persistent, MYSQLND_STATS * stats, MYSQLND_ERROR_INFO * error_info)
 {
-       size_t ppec_alloc_size = sizeof(MYSQLND_PFC) + mysqlnd_plugin_count() * sizeof(void *);
-       size_t ppec_data_alloc_size = sizeof(MYSQLND_PFC_DATA) + mysqlnd_plugin_count() * sizeof(void *);
-       MYSQLND_PFC * ppec = mnd_pecalloc(1, ppec_alloc_size, persistent);
-       MYSQLND_PFC_DATA * ppec_data = mnd_pecalloc(1, ppec_data_alloc_size, persistent);
+       size_t pfc_alloc_size = sizeof(MYSQLND_PFC) + mysqlnd_plugin_count() * sizeof(void *);
+       size_t pfc_data_alloc_size = sizeof(MYSQLND_PFC_DATA) + mysqlnd_plugin_count() * sizeof(void *);
+       MYSQLND_PFC * pfc = mnd_pecalloc(1, pfc_alloc_size, persistent);
+       MYSQLND_PFC_DATA * pfc_data = mnd_pecalloc(1, pfc_data_alloc_size, persistent);
 
-       DBG_ENTER("mysqlnd_object_factory::get_ppec");
+       DBG_ENTER("mysqlnd_object_factory::get_pfc");
        DBG_INF_FMT("persistent=%u", persistent);
-       if (ppec && ppec_data) {
-               ppec->data = ppec_data;
-               ppec->persistent = ppec->data->persistent = persistent;
-               ppec->data->m = *mysqlnd_pfc_get_methods();
-
-               if (PASS != ppec->data->m.init(ppec, stats, error_info)) {
-                       ppec->data->m.dtor(ppec, stats, error_info);
-                       ppec = NULL;
+       if (pfc && pfc_data) {
+               pfc->data = pfc_data;
+               pfc->persistent = pfc->data->persistent = persistent;
+               pfc->data->m = *mysqlnd_pfc_get_methods();
+
+               if (PASS != pfc->data->m.init(pfc, stats, error_info)) {
+                       pfc->data->m.dtor(pfc, stats, error_info);
+                       pfc = NULL;
                }
        } else {
-               if (ppec_data) {
-                       mnd_pefree(ppec_data, persistent);
-                       ppec_data = NULL;
+               if (pfc_data) {
+                       mnd_pefree(pfc_data, persistent);
+                       pfc_data = NULL;
                }
-               if (ppec) {
-                       mnd_pefree(ppec, persistent);
-                       ppec = NULL;
+               if (pfc) {
+                       mnd_pefree(pfc, persistent);
+                       pfc = NULL;
                }
        }
-       DBG_RETURN(ppec);
+       DBG_RETURN(pfc);
 }
 /* }}} */
 
@@ -337,7 +335,7 @@ PHPAPI MYSQLND_CLASS_METHODS_START(mysqlnd_object_factory)
        MYSQLND_METHOD(mysqlnd_object_factory, get_connection),
        MYSQLND_METHOD(mysqlnd_object_factory, clone_connection_object),
        MYSQLND_METHOD(mysqlnd_object_factory, get_prepared_statement),
-       MYSQLND_METHOD(mysqlnd_object_factory, get_ppec),
+       MYSQLND_METHOD(mysqlnd_object_factory, get_pfc),
        MYSQLND_METHOD(mysqlnd_object_factory, get_vio),
        MYSQLND_METHOD(mysqlnd_object_factory, get_protocol_payload_decoder_factory)
 MYSQLND_CLASS_METHODS_END;
diff --git a/ext/mysqlnd/mysqlnd_loaddata.c b/ext/mysqlnd/mysqlnd_loaddata.c
index 4eb85e20e00f3516d6a3393722cce884f085eca3..d9ad4824d4bb49bf614cc4a4f4164c8bd20d4ddd 100644 (file)
--- a/ext/mysqlnd/mysqlnd_loaddata.c
+++ b/ext/mysqlnd/mysqlnd_loaddata.c
@@ -18,7 +18,6 @@
   +----------------------------------------------------------------------+
 */
 #include "php.h"
-#include "php_globals.h"
 #include "mysqlnd.h"
 #include "mysqlnd_wireprotocol.h"
 #include "mysqlnd_priv.h"
diff --git a/ext/mysqlnd/mysqlnd_protocol_frame_codec.c b/ext/mysqlnd/mysqlnd_protocol_frame_codec.c
index b23b8d37c2885314fb215e7ef037550a7e3c2517..2c4d6323420fe8fc1806483a92d014ea4ecd998a 100644 (file)
--- a/ext/mysqlnd/mysqlnd_protocol_frame_codec.c
+++ b/ext/mysqlnd/mysqlnd_protocol_frame_codec.c
@@ -17,15 +17,11 @@
   +----------------------------------------------------------------------+
 */
 #include "php.h"
-#include "php_globals.h"
 #include "mysqlnd.h"
 #include "mysqlnd_priv.h"
 #include "mysqlnd_wireprotocol.h"
 #include "mysqlnd_statistics.h"
 #include "mysqlnd_debug.h"
-#include "mysqlnd_ext_plugin.h"
-#include "php_network.h"
-#include "zend_ini.h"
 #ifdef MYSQLND_COMPRESSION_ENABLED
 #include <zlib.h>
 #endif
diff --git a/ext/mysqlnd/mysqlnd_ps_codec.c b/ext/mysqlnd/mysqlnd_ps_codec.c
index a08d9865f9ba84a3ebdf12789ae2c053b502b932..a474caf7303658d632303c016a7eec4decb0d56c 100644 (file)
--- a/ext/mysqlnd/mysqlnd_ps_codec.c
+++ b/ext/mysqlnd/mysqlnd_ps_codec.c
@@ -24,7 +24,7 @@
 #include "mysqlnd_wireprotocol.h"
 #include "mysqlnd_priv.h"
 #include "mysqlnd_debug.h"
-#include "ext/mysqlnd/mysql_float_to_double.h"
+#include "mysql_float_to_double.h"
 
 #define MYSQLND_SILENT
 
diff --git a/ext/mysqlnd/mysqlnd_vio.c b/ext/mysqlnd/mysqlnd_vio.c
index 0ec6875b98d6c764248f643109d55465a3577d06..37a4c20d24d9bd4be9c0d91f9cf0192e7c2b571a 100644 (file)
--- a/ext/mysqlnd/mysqlnd_vio.c
+++ b/ext/mysqlnd/mysqlnd_vio.c
@@ -17,15 +17,12 @@
   +----------------------------------------------------------------------+
 */
 #include "php.h"
-#include "php_globals.h"
 #include "mysqlnd.h"
 #include "mysqlnd_priv.h"
-#include "mysqlnd_wireprotocol.h"
 #include "mysqlnd_statistics.h"
 #include "mysqlnd_debug.h"
 #include "mysqlnd_ext_plugin.h"
 #include "php_network.h"
-#include "zend_ini.h"
 
 #ifndef PHP_WIN32
 #include <netinet/tcp.h>
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index dd239d554531e0bfb855022a96cd1f4b87ef1579..221b089442599401c8b3d4ae8d83efe56f69c690 100644 (file)
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -17,9 +17,7 @@
   |          Georg Richter <georg@mysql.com>                             |
   +----------------------------------------------------------------------+
 */
-
 #include "php.h"
-#include "php_globals.h"
 #include "mysqlnd.h"
 #include "mysqlnd_priv.h"
 #include "mysqlnd_wireprotocol.h"
diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c
index 5f1bf05217e4db547a2d3d0f6deac8d6c1e00ac2..b4cba4c5dceb0ad62e0c779c374055dc30fb9ef0 100644 (file)
--- a/ext/mysqlnd/php_mysqlnd.c
+++ b/ext/mysqlnd/php_mysqlnd.c
@@ -20,7 +20,6 @@
 
 /* $Id$ */
 #include "php.h"
-#include "php_ini.h"
 #include "mysqlnd.h"
 #include "mysqlnd_priv.h"
 #include "mysqlnd_debug.h"
Unnamed repository; edit this file 'description' to name the repository.