com php-src: clean up - remove checked questions: ext/mysql/php _mysql.c ext/session/session.c ext/sqlite3/sqlite 3.c
| From: | Xinchen Hui | Date: | Wed, 13 Aug 2014 08:44:22 +0000 |
| Subject: | com php-src: clean up - remove checked questions: ext/mysql/php _mysql.c ext/session/session.c ext/sqlite3/sqlite 3.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79853@lists.php.net to get a copy of this message | ||
Commit: 35dd200430994b1b2807633e5d5dd3370b59633e
Author: Xinchen Hui <laruence@php.net> Wed, 13 Aug 2014 16:44:22 +0800
Parents: da3aeeed39f24e34e9318d7123ff84f0c5a98e61
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=35dd200430994b1b2807633e5d5dd3370b59633e
Log:
clean up - remove checked questions
Changed paths:
M ext/mysql/php_mysql.c
M ext/session/session.c
M ext/sqlite3/sqlite3.c
Diff:
diff --git a/ext/mysql/php_mysql..c b/ext/mysql/php_mysql.c
index 30cac98..f4124d3 100644
--- a/ext/mysql/php_mysql.c
+++ b/ext/mysql/php_mysql.c
@@ -641,10 +641,9 @@ PHP_RINIT_FUNCTION(mysql)
/* }}} */
#if defined(A0) && defined(MYSQL_USE_MYSQLND)
-static int php_mysql_persistent_helper(zval *el;zend_rsrc_list_entry *le TSRMLS_DC)
+static int php_mysql_persistent_helper(zval *el TSRMLS_DC)
{
- //???
- //zend_rsrc_list_entry *le = (zend_rsrc_list_entry*)Z_PTR_P(el);
+ zend_resource *le = (zend_resource *)Z_PTR_P(el);
if (le->type == le_plink) {
mysqlnd_end_psession(((php_mysql_conn *) le->ptr)->conn);
}
diff --git a/ext/session/session.c b/ext/session/session.c
index 46ffa56..3dc47f6 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1935,8 +1935,8 @@ static PHP_FUNCTION(session_id)
}
if (PS(id)) {
- //??? keep compatibility for "\0" characters
- //??? see: ext/session/tests/session_id_error3.phpt
+ /* keep compatibility for "\0" characters
+ / see: ext/session/tests/session_id_error3.phpt */
int len = strlen(PS(id)->val);
if (UNEXPECTED(len != PS(id)->len)) {
RETVAL_STR(STR_INIT(PS(id)->val, len, 0));
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
index 1d3c612..54c8097 100644
--- a/ext/sqlite3/sqlite3.c
+++ b/ext/sqlite3/sqlite3.c
@@ -2002,7 +2002,6 @@ static void php_sqlite3_free_list_dtor(void **item)
static int php_sqlite3_compare_stmt_zval_free(php_sqlite3_free_list **free_list, zval *statement )
/* {{{ */
{
- //????? return ((*free_list)->stmt_obj->initialised && statement ==
(*free_list)->stmt_obj_zval);
return ((*free_list)->stmt_obj->initialised && Z_PTR_P(statement) ==
Z_PTR((*free_list)->stmt_obj_zval));
}
/* }}} */