cvs: php4 /ext/mysql php_mysql.c php_mysql.h

yohgaki Sat Aug 24 17:41:25 2002 EDT Modified files: /php4/ext/mysql php_mysql.c php_mysql.h Log: Rename mysql_character_set_name() to mysql_client_encoding(). pg_client_encoding() is available from PHP4.0.3 and this function is available from PHP 4.3.0 Index: php4/ext/mysql/php_mysql.c diff -u php4/ext/mysql/php_mysql.c:1.156 php4/ext/mysql/php_mysql.c:1.157 --- php4/ext/mysql/php_mysql.c:1.156 Sat Aug 24 09:15:35 2002 +++ php4/ext/mysql/php_mysql.c Sat Aug 24 17:41:25 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.156 2002/08/24 13:15:35 zeev Exp $ */ +/* $Id: php_mysql.c,v 1.157 2002/08/24 21:41:25 yohgaki Exp $ */ /* TODO: * @@ -158,7 +158,7 @@ PHP_FE(mysql_real_escape_string, NULL) PHP_FE(mysql_stat, NULL) PHP_FE(mysql_thread_id, NULL) - PHP_FE(mysql_character_set_name, NULL) + PHP_FE(mysql_client_encoding, NULL) PHP_FE(mysql_ping, NULL) #ifdef HAVE_GETINFO_FUNCS PHP_FE(mysql_get_client_info, NULL) @@ -1054,9 +1054,9 @@ } /* }}} */ -/* {{{ proto string mysql_character_set_name([int link_identifier]) +/* {{{ proto string mysql_client_encoding([int link_identifier]) Returns the default character set for the current connection */ -PHP_FUNCTION(mysql_character_set_name) +PHP_FUNCTION(mysql_client_encoding) { zval *mysql_link = NULL; int id = -1; Index: php4/ext/mysql/php_mysql.h diff -u php4/ext/mysql/php_mysql.h:1.31 php4/ext/mysql/php_mysql.h:1.32 --- php4/ext/mysql/php_mysql.h:1.31 Tue Jul 16 09:53:54 2002 +++ php4/ext/mysql/php_mysql.h Sat Aug 24 17:41:25 2002 @@ -17,7 +17,7 @@ */ -/* $Id: php_mysql.h,v 1.31 2002/07/16 13:53:54 georg Exp $ */ +/* $Id: php_mysql.h,v 1.32 2002/08/24 21:41:25 yohgaki Exp $ */ #ifndef PHP_MYSQL_H #define PHP_MYSQL_H @@ -89,7 +89,7 @@ PHP_FUNCTION(mysql_info); PHP_FUNCTION(mysql_stat); PHP_FUNCTION(mysql_thread_id); -PHP_FUNCTION(mysql_character_set_name); +PHP_FUNCTION(mysql_client_encoding); PHP_FUNCTION(mysql_ping); ZEND_BEGIN_MODULE_GLOBALS(mysql)