andrey                                   Wed, 15 Sep 2010 12:11:33 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=303392

Log:
Remove unneeded proxy function _mysqlnd_end_psession

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
    U   php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd.c
    U   php/php-src/trunk/ext/mysqlnd/mysqlnd.h

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c  2010-09-15 10:51:55 UTC 
(rev 303391)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.c  2010-09-15 12:11:33 UTC 
(rev 303392)
@@ -409,15 +409,6 @@
 /* }}} */


-/* {{{ _mysqlnd_end_psession */
-PHPAPI void _mysqlnd_end_psession(MYSQLND * conn TSRMLS_DC)
-{
-       DBG_ENTER("_mysqlnd_end_psession");
-       conn->m->end_psession(conn TSRMLS_CC);
-       DBG_VOID_RETURN;
-}
-/* }}} */
-
 /* {{{ mysqlnd_conn::restart_psession */
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_conn, restart_psession)(MYSQLND * conn TSRMLS_DC)

Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2010-09-15 10:51:55 UTC 
(rev 303391)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd.h  2010-09-15 12:11:33 UTC 
(rev 303392)
@@ -87,8 +87,7 @@

 #define mysqlnd_restart_psession(conn) _mysqlnd_restart_psession((conn) 
TSRMLS_CC)
 PHPAPI void _mysqlnd_restart_psession(MYSQLND * conn TSRMLS_DC);
-#define mysqlnd_end_psession(conn) _mysqlnd_end_psession((conn) TSRMLS_CC)
-PHPAPI void _mysqlnd_end_psession(MYSQLND *conn TSRMLS_DC);
+#define mysqlnd_end_psession(conn) (conn)->m->end_psession((conn) TSRMLS_CC)
 PHPAPI void mysqlnd_minfo_print_hash(zval *values);
 #define mysqlnd_thread_safe()  TRUE


Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.c     2010-09-15 10:51:55 UTC (rev 
303391)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.c     2010-09-15 12:11:33 UTC (rev 
303392)
@@ -409,15 +409,6 @@
 /* }}} */


-/* {{{ _mysqlnd_end_psession */
-PHPAPI void _mysqlnd_end_psession(MYSQLND * conn TSRMLS_DC)
-{
-       DBG_ENTER("_mysqlnd_end_psession");
-       conn->m->end_psession(conn TSRMLS_CC);
-       DBG_VOID_RETURN;
-}
-/* }}} */
-
 /* {{{ mysqlnd_conn::restart_psession */
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_conn, restart_psession)(MYSQLND * conn TSRMLS_DC)

Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd.h
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd.h     2010-09-15 10:51:55 UTC (rev 
303391)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd.h     2010-09-15 12:11:33 UTC (rev 
303392)
@@ -87,8 +87,7 @@

 #define mysqlnd_restart_psession(conn) _mysqlnd_restart_psession((conn) 
TSRMLS_CC)
 PHPAPI void _mysqlnd_restart_psession(MYSQLND * conn TSRMLS_DC);
-#define mysqlnd_end_psession(conn) _mysqlnd_end_psession((conn) TSRMLS_CC)
-PHPAPI void _mysqlnd_end_psession(MYSQLND *conn TSRMLS_DC);
+#define mysqlnd_end_psession(conn) (conn)->m->end_psession((conn) TSRMLS_CC)
 PHPAPI void mysqlnd_minfo_print_hash(zval *values);
 #define mysqlnd_thread_safe()  TRUE


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to