bjori Mon Jun 26 11:31:19 2006 UTC
Modified files:
/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:
Removed custom deprecate error messages
Use the fancy ZEND_ACC_DEPRECATED flag.
http://cvs.php.net/viewvc.cgi/php-src/ext/mcrypt/mcrypt.c?r1=1.98&r2=1.99&diff_format=u
Index: php-src/ext/mcrypt/mcrypt.c
diff -u php-src/ext/mcrypt/mcrypt.c:1.98 php-src/ext/mcrypt/mcrypt.c:1.99
--- php-src/ext/mcrypt/mcrypt.c:1.98 Tue Jun 13 13:12:18 2006
+++ php-src/ext/mcrypt/mcrypt.c Mon Jun 26 11:31:19 2006
@@ -16,7 +16,7 @@
| Derick Rethans <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: mcrypt.c,v 1.98 2006/06/13 13:12:18 dmitry Exp $ */
+/* $Id: mcrypt.c,v 1.99 2006/06/26 11:31:19 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.27&r2=1.28&diff_format=u
Index: php-src/ext/mcrypt/php_mcrypt.h
diff -u php-src/ext/mcrypt/php_mcrypt.h:1.27
php-src/ext/mcrypt/php_mcrypt.h:1.28
--- php-src/ext/mcrypt/php_mcrypt.h:1.27 Sun Jan 1 13:09:51 2006
+++ php-src/ext/mcrypt/php_mcrypt.h Mon Jun 26 11:31:19 2006
@@ -16,7 +16,7 @@
| Derick Rethans <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: php_mcrypt.h,v 1.27 2006/01/01 13:09:51 sniper Exp $ */
+/* $Id: php_mcrypt.h,v 1.28 2006/06/26 11:31:19 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.223&r2=1.224&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.223 php-src/ext/mysql/php_mysql.c:1.224
--- php-src/ext/mysql/php_mysql.c:1.223 Tue Jun 13 13:12:19 2006
+++ php-src/ext/mysql/php_mysql.c Mon Jun 26 11:31:19 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.223 2006/06/13 13:12:19 dmitry Exp $ */
+/* $Id: php_mysql.c,v 1.224 2006/06/26 11:31:19 bjori Exp $ */
/* TODO:
*
@@ -126,15 +126,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)
@@ -185,15 +185,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)
@@ -1148,8 +1148,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();
@@ -1191,9 +1189,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);
@@ -1446,7 +1441,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.779&r2=1.780&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.779
php-src/ext/standard/basic_functions.c:1.780
--- php-src/ext/standard/basic_functions.c:1.779 Sun Jun 25 20:52:34 2006
+++ php-src/ext/standard/basic_functions.c Mon Jun 26 11:31:19 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.779 2006/06/25 20:52:34 bjori Exp $ */
+/* $Id: basic_functions.c,v 1.780 2006/06/26 11:31:19 bjori Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2394,12 +2394,6 @@
ZEND_ARG_INFO(0, mode)
ZEND_END_ARG_INFO()
-static
-ZEND_BEGIN_ARG_INFO(arginfo_set_socket_blocking, 0)
- ZEND_ARG_INFO(0, socket)
- ZEND_ARG_INFO(0, mode)
-ZEND_END_ARG_INFO()
-
#if HAVE_SYS_TIME_H || defined(PHP_WIN32)
static
ZEND_BEGIN_ARG_INFO(arginfo_stream_set_timeout, 0)
@@ -3377,8 +3371,8 @@
PHP_FE(error_log,
arginfo_error_log)
PHP_FE(call_user_func,
arginfo_call_user_func)
PHP_FE(call_user_func_array,
arginfo_call_user_func_array)
- PHP_FE(call_user_method,
arginfo_call_user_method)
- PHP_FE(call_user_method_array,
arginfo_call_user_method_array)
+ PHP_DEP_FE(call_user_method,
arginfo_call_user_method)
+ PHP_DEP_FE(call_user_method_array,
arginfo_call_user_method_array)
PHP_FE(serialize,
arginfo_serialize)
PHP_FE(unserialize,
arginfo_unserialize)
@@ -3535,7 +3529,7 @@
PHP_FE(stream_set_write_buffer,
arginfo_stream_set_write_buffer)
PHP_FALIAS(set_file_buffer, stream_set_write_buffer,
arginfo_stream_set_write_buffer)
- PHP_FE(set_socket_blocking,
arginfo_set_socket_blocking)
+ PHP_DEP_FALIAS(set_socket_blocking, stream_set_blocking,
arginfo_stream_set_blocking)
PHP_FE(stream_set_blocking,
arginfo_stream_set_blocking)
PHP_FALIAS(socket_set_blocking, stream_set_blocking,
arginfo_stream_set_blocking)
@@ -5050,8 +5044,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)
@@ -5060,8 +5052,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;
}
@@ -5099,7 +5089,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.79&r2=1.80&diff_format=u
Index: php-src/ext/standard/streamsfuncs.c
diff -u php-src/ext/standard/streamsfuncs.c:1.79
php-src/ext/standard/streamsfuncs.c:1.80
--- php-src/ext/standard/streamsfuncs.c:1.79 Sun Jun 25 19:19:31 2006
+++ php-src/ext/standard/streamsfuncs.c Mon Jun 26 11:31:19 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.c,v 1.79 2006/06/25 19:19:31 bjori Exp $ */
+/* $Id: streamsfuncs.c,v 1.80 2006/06/26 11:31:19 bjori Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1343,15 +1343,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.15&r2=1.16&diff_format=u
Index: php-src/ext/standard/streamsfuncs.h
diff -u php-src/ext/standard/streamsfuncs.h:1.15
php-src/ext/standard/streamsfuncs.h:1.16
--- php-src/ext/standard/streamsfuncs.h:1.15 Wed Mar 29 01:20:42 2006
+++ php-src/ext/standard/streamsfuncs.h Mon Jun 26 11:31:19 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streamsfuncs.h,v 1.15 2006/03/29 01:20:42 pollita Exp $ */
+/* $Id: streamsfuncs.h,v 1.16 2006/06/26 11:31:19 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
