bjori Mon Jun 26 16:33:39 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/mcrypt mcrypt.c php_mcrypt.h /php-src/ext/mysql php_mysql.c /php-src/ext/standard basic_functions.c streamsfuncs.c streamsfuncs.h Log: MFH: use the ZEND_ACC_DEPRECATED flag rather than custom warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.91.2.3.2.4&r2=1.91.2.3.2.5&diff_format=u Index: php-src/ext/mcrypt/mcrypt.c diff -u php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.4 php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.5 --- php-src/ext/mcrypt/mcrypt.c:1.91.2.3.2.4 Thu Jun 15 18:33:07 2006 +++ php-src/ext/mcrypt/mcrypt.c Mon Jun 26 16:33:38 2006 @@ -16,7 +16,7 @@ | Derick Rethans <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: mcrypt.c,v 1.91.2.3.2.4 2006/06/15 18:33:07 dmitry Exp $ */ +/* $Id: mcrypt.c,v 1.91.2.3.2.5 2006/06/26 16:33:38 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -63,7 +63,7 @@ PHP_FE(mcrypt_generic_init, NULL) PHP_FE(mcrypt_generic, NULL) PHP_FE(mdecrypt_generic, NULL) - PHP_FE(mcrypt_generic_end, NULL) + PHP_DEP_FALIAS(mcrypt_generic_end, mcrypt_generic_deinit, NULL) PHP_FE(mcrypt_generic_deinit, NULL) PHP_FE(mcrypt_enc_self_test, NULL) @@ -604,16 +604,6 @@ /* }}} */ -/* {{{ proto bool mcrypt_generic_end(resource td) - This function terminates encrypt specified by the descriptor td */ -PHP_FUNCTION(mcrypt_generic_end) -{ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "This function is deprecated, please use mcrypt_generic_deinit()"); - zif_mcrypt_generic_deinit(INTERNAL_FUNCTION_PARAM_PASSTHRU); -} -/* }}} */ - - /* {{{ proto bool mcrypt_generic_deinit(resource td) This function terminates encrypt specified by the descriptor td */ PHP_FUNCTION(mcrypt_generic_deinit) http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/php_mcrypt.h?r1=1.26.2.1&r2=1.26.2.1.2.1&diff_format=u Index: php-src/ext/mcrypt/php_mcrypt.h diff -u php-src/ext/mcrypt/php_mcrypt.h:1.26.2.1 php-src/ext/mcrypt/php_mcrypt.h:1.26.2.1.2.1 --- php-src/ext/mcrypt/php_mcrypt.h:1.26.2.1 Sun Jan 1 12:50:08 2006 +++ php-src/ext/mcrypt/php_mcrypt.h Mon Jun 26 16:33:38 2006 @@ -16,7 +16,7 @@ | Derick Rethans <[EMAIL PROTECTED]> | +----------------------------------------------------------------------+ */ -/* $Id: php_mcrypt.h,v 1.26.2.1 2006/01/01 12:50:08 sniper Exp $ */ +/* $Id: php_mcrypt.h,v 1.26.2.1.2.1 2006/06/26 16:33:38 bjori Exp $ */ #ifndef PHP_MCRYPT_H #define PHP_MCRYPT_H @@ -52,7 +52,6 @@ PHP_FUNCTION(mcrypt_generic_init); PHP_FUNCTION(mcrypt_generic); PHP_FUNCTION(mdecrypt_generic); -PHP_FUNCTION(mcrypt_generic_end); PHP_FUNCTION(mcrypt_generic_deinit); PHP_FUNCTION(mcrypt_enc_self_test); http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.213.2.6.2.3&r2=1.213.2.6.2.4&diff_format=u Index: php-src/ext/mysql/php_mysql.c diff -u php-src/ext/mysql/php_mysql.c:1.213.2.6.2.3 php-src/ext/mysql/php_mysql.c:1.213.2.6.2.4 --- php-src/ext/mysql/php_mysql.c:1.213.2.6.2.3 Thu Jun 15 18:33:07 2006 +++ php-src/ext/mysql/php_mysql.c Mon Jun 26 16:33:39 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mysql.c,v 1.213.2.6.2.3 2006/06/15 18:33:07 dmitry Exp $ */ +/* $Id: php_mysql.c,v 1.213.2.6.2.4 2006/06/26 16:33:39 bjori Exp $ */ /* TODO: * @@ -133,15 +133,15 @@ PHP_FE(mysql_select_db, NULL) #ifndef NETWARE /* The below two functions not supported on NetWare */ #if MYSQL_VERSION_ID < 40000 - PHP_FE(mysql_create_db, NULL) - PHP_FE(mysql_drop_db, NULL) + PHP_DEP_FE(mysql_create_db, NULL) + PHP_DEP_FE(mysql_drop_db, NULL) #endif #endif /* NETWARE */ PHP_FE(mysql_query, NULL) PHP_FE(mysql_unbuffered_query, NULL) PHP_FE(mysql_db_query, NULL) PHP_FE(mysql_list_dbs, NULL) - PHP_FE(mysql_list_tables, NULL) + PHP_DEP_FE(mysql_list_tables, NULL) PHP_FE(mysql_list_fields, NULL) PHP_FE(mysql_list_processes, NULL) PHP_FE(mysql_error, NULL) @@ -192,15 +192,15 @@ PHP_FALIAS(mysql_selectdb, mysql_select_db, NULL) #ifndef NETWARE /* The below two functions not supported on NetWare */ #if MYSQL_VERSION_ID < 40000 - PHP_FALIAS(mysql_createdb, mysql_create_db, NULL) - PHP_FALIAS(mysql_dropdb, mysql_drop_db, NULL) + PHP_DEP_FALIAS(mysql_createdb, mysql_create_db, NULL) + PHP_DEP_FALIAS(mysql_dropdb, mysql_drop_db, NULL) #endif #endif /* NETWARE */ PHP_FALIAS(mysql_freeresult, mysql_free_result, NULL) PHP_FALIAS(mysql_numfields, mysql_num_fields, NULL) PHP_FALIAS(mysql_numrows, mysql_num_rows, NULL) PHP_FALIAS(mysql_listdbs, mysql_list_dbs, NULL) - PHP_FALIAS(mysql_listtables, mysql_list_tables, NULL) + PHP_DEP_FALIAS(mysql_listtables,mysql_list_tables, NULL) PHP_FALIAS(mysql_listfields, mysql_list_fields, NULL) PHP_FALIAS(mysql_db_name, mysql_result, NULL) PHP_FALIAS(mysql_dbname, mysql_result, NULL) @@ -1155,8 +1155,6 @@ break; } - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "This function is deprecated, please use mysql_query() to issue a SQL CREATE DATABASE statement instead."); - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink); PHPMY_UNBUFFERED_QUERY_CHECK(); @@ -1198,9 +1196,6 @@ break; } - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "This function is deprecated, please use mysql_query() to issue a SQL DROP DATABASE statement instead."); - - ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink); convert_to_string_ex(db); @@ -1452,7 +1447,6 @@ WRONG_PARAM_COUNT; break; } - php_error_docref(NULL TSRMLS_CC, E_STRICT, "mysql_list_tables() is deprecated"); ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, mysql_link, id, "MySQL-Link", le_link, le_plink); convert_to_string_ex(db); http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.7&r2=1.725.2.31.2.8&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.7 php-src/ext/standard/basic_functions.c:1.725.2.31.2.8 --- php-src/ext/standard/basic_functions.c:1.725.2.31.2.7 Mon Jun 26 13:15:20 2006 +++ php-src/ext/standard/basic_functions.c Mon Jun 26 16:33:39 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.725.2.31.2.7 2006/06/26 13:15:20 rasmus Exp $ */ +/* $Id: basic_functions.c,v 1.725.2.31.2.8 2006/06/26 16:33:39 bjori Exp $ */ #include "php.h" #include "php_streams.h" @@ -456,8 +456,8 @@ PHP_FE(error_log, NULL) PHP_FE(call_user_func, NULL) PHP_FE(call_user_func_array, NULL) - PHP_FE(call_user_method, second_arg_force_ref) - PHP_FE(call_user_method_array, second_arg_force_ref) + PHP_DEP_FE(call_user_method, second_arg_force_ref) + PHP_DEP_FE(call_user_method_array, second_arg_force_ref) PHP_FE(serialize, NULL) PHP_FE(unserialize, NULL) @@ -612,7 +612,7 @@ PHP_FE(stream_set_write_buffer, NULL) PHP_FALIAS(set_file_buffer, stream_set_write_buffer, NULL) - PHP_FE(set_socket_blocking, NULL) + PHP_DEP_FALIAS(set_socket_blocking, stream_set_blocking, NULL) PHP_FE(stream_set_blocking, NULL) PHP_FALIAS(socket_set_blocking, stream_set_blocking, NULL) @@ -2175,8 +2175,6 @@ } /* }}} */ -#define _CUM_DEPREC "This function is deprecated, use the call_user_func variety with the array(&$obj, \"method\") syntax instead" - /* {{{ proto mixed call_user_method(string method_name, mixed object [, mixed parameter] [, mixed ...]) Call a user method on a specific object or class */ PHP_FUNCTION(call_user_method) @@ -2185,8 +2183,6 @@ zval *retval_ptr; int arg_count = ZEND_NUM_ARGS(); - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s", _CUM_DEPREC); - if (arg_count < 2) { WRONG_PARAM_COUNT; } @@ -2222,8 +2218,6 @@ HashTable *params_ar; int num_elems, element = 0; - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s", _CUM_DEPREC); - if (ZEND_NUM_ARGS() != 3 || zend_get_parameters_ex(3, &method_name, &obj, ¶ms) == FAILURE) { WRONG_PARAM_COUNT; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.c?r1=1.58.2.6&r2=1.58.2.6.2.1&diff_format=u Index: php-src/ext/standard/streamsfuncs.c diff -u php-src/ext/standard/streamsfuncs.c:1.58.2.6 php-src/ext/standard/streamsfuncs.c:1.58.2.6.2.1 --- php-src/ext/standard/streamsfuncs.c:1.58.2.6 Wed Apr 19 08:43:29 2006 +++ php-src/ext/standard/streamsfuncs.c Mon Jun 26 16:33:39 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streamsfuncs.c,v 1.58.2.6 2006/04/19 08:43:29 tony2001 Exp $ */ +/* $Id: streamsfuncs.c,v 1.58.2.6.2.1 2006/06/26 16:33:39 bjori Exp $ */ #include "php.h" #include "php_globals.h" @@ -1225,15 +1225,6 @@ /* }}} */ -/* {{{ proto bool set_socket_blocking(resource socket, int mode) - Set blocking/non-blocking mode on a socket */ -PHP_FUNCTION(set_socket_blocking) -{ - php_error_docref(NULL TSRMLS_CC, E_NOTICE, "This function is deprecated, use stream_set_blocking() instead"); - PHP_FN(stream_set_blocking)(INTERNAL_FUNCTION_PARAM_PASSTHRU); -} -/* }}} */ - /* {{{ proto bool stream_set_timeout(resource stream, int seconds, int microseconds) Set timeout on stream read to seconds + microseonds */ #if HAVE_SYS_TIME_H || defined(PHP_WIN32) http://cvs.php.net/viewvc.cgi/php-src/ext/standard/streamsfuncs.h?r1=1.13.2.1&r2=1.13.2.1.2.1&diff_format=u Index: php-src/ext/standard/streamsfuncs.h diff -u php-src/ext/standard/streamsfuncs.h:1.13.2.1 php-src/ext/standard/streamsfuncs.h:1.13.2.1.2.1 --- php-src/ext/standard/streamsfuncs.h:1.13.2.1 Sun Jan 1 12:50:15 2006 +++ php-src/ext/standard/streamsfuncs.h Mon Jun 26 16:33:39 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streamsfuncs.h,v 1.13.2.1 2006/01/01 12:50:15 sniper Exp $ */ +/* $Id: streamsfuncs.h,v 1.13.2.1.2.1 2006/06/26 16:33:39 bjori Exp $ */ /* Flags for stream_socket_client */ #define PHP_STREAM_CLIENT_PERSISTENT 1 @@ -33,7 +33,6 @@ PHP_FUNCTION(stream_copy_to_stream); PHP_FUNCTION(stream_get_contents); -PHP_FUNCTION(set_socket_blocking); /* deprecated */ PHP_FUNCTION(stream_set_blocking); PHP_FUNCTION(stream_select); PHP_FUNCTION(stream_set_timeout);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php