cvs: php-src /ext/mysqli mysqli_api.c
| From: | Andrey Hristov | Date: | Sat, 07 May 2005 08:03:36 +0000 |
| Subject: | cvs: php-src /ext/mysqli mysqli_api.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-31762@lists.php.net to get a copy of this message | ||
andrey Sat May 7 04:03:36 2005 EDT
Modified files:
/php-src/ext/mysqli mysqli_api.c
Log:
return directly
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.110&r2=1.111&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.110 php-src/ext/mysqli/mysqli_api.c:1.111
--- php-src/ext/mysqli/mysqli_api.c:1.110 Sat May 7 03:44:41 2005
+++ php-src/ext/mysqli/mysqli_api.c Sat May 7 04:03:35 2005
@@ -15,7 +15,7 @@
| Author: Georg Richter <georg@php.net> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.110 2005/05/07 07:44:41 andrey Exp $
+ $Id: mysqli_api.c,v 1.111 2005/05/07 08:03:35 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -405,7 +405,6 @@
{
MY_MYSQL *mysql;
zval *mysql_link;
- char *charsetname;
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
&mysql_link, mysqli_link_class_entry) == FAILURE) {
return;
@@ -413,9 +412,7 @@
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link");
- charsetname = (char *)mysql_character_set_name(mysql->mysql);
-
- RETURN_STRING(charsetname, 1);
+ RETURN_STRING((char *) mysql_character_set_name(mysql->mysql), 1);
}
/* }}} */