diff options
| author | Zeev Suraski <zeev@php.net> | 2000-06-02 12:36:54 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-06-02 12:36:54 +0000 |
| commit | 746f01802dddd2c285cbf3011122d6b59e8d97cc (patch) | |
| tree | b629475c5491e6faf35170ec6c06554314191772 /Zend/zend_builtin_functions.c | |
| parent | 06388f5181b6b5389a1aaab1fedb90b0b267e064 (diff) | |
| download | php-git-746f01802dddd2c285cbf3011122d6b59e8d97cc.tar.gz | |
Update error code
Diffstat (limited to 'Zend/zend_builtin_functions.c')
| -rw-r--r-- | Zend/zend_builtin_functions.c | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 2e1581e7e5..3333530db2 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -52,8 +52,8 @@ static ZEND_FUNCTION(is_subclass_of); static ZEND_FUNCTION(get_class_vars); static ZEND_FUNCTION(get_object_vars); static ZEND_FUNCTION(get_class_methods); -static ZEND_FUNCTION(user_error); -static ZEND_FUNCTION(set_user_error_handler); +static ZEND_FUNCTION(trigger_error); +static ZEND_FUNCTION(set_error_handler); static ZEND_FUNCTION(get_declared_classes); unsigned char first_arg_force_ref[] = { 1, BYREF_FORCE }; @@ -89,8 +89,9 @@ static zend_function_entry builtin_functions[] = { ZEND_FE(get_class_vars, NULL) ZEND_FE(get_object_vars, NULL) ZEND_FE(get_class_methods, NULL) - ZEND_FE(user_error, NULL) - ZEND_FE(set_user_error_handler, NULL) + ZEND_FE(trigger_error, NULL) + ZEND_FALIAS(user_error, trigger_error, NULL) + ZEND_FE(set_error_handler, NULL) ZEND_FE(get_declared_classes, NULL) { NULL, NULL, NULL } }; @@ -708,9 +709,9 @@ ZEND_FUNCTION(get_included_files) /* }}} */ -/* {{{ proto void user_error(string messsage [, int error_type]) +/* {{{ proto void trigger_error(string messsage [, int error_type]) Generates a user-level error/warning/notice message */ -ZEND_FUNCTION(user_error) +ZEND_FUNCTION(trigger_error) { int error_type = E_USER_NOTICE; zval **z_error_type, **z_error_message; @@ -746,7 +747,9 @@ ZEND_FUNCTION(user_error) /* }}} */ -ZEND_FUNCTION(set_user_error_handler) +/* {{{ proto int set_error_handler(string error_handler) + Sets a user-defined error handler function */ +ZEND_FUNCTION(set_error_handler) { zval **error_handler; @@ -761,11 +764,19 @@ ZEND_FUNCTION(set_user_error_handler) ALLOC_ZVAL(EG(user_error_handler)); } + if (Z_STRLEN_PP(error_handler)==0) { /* unset user-defined handler */ + FREE_ZVAL(EG(user_error_handler)); + EG(user_error_handler) = NULL; + RETURN_TRUE; + } + *EG(user_error_handler) = **error_handler; zval_copy_ctor(EG(user_error_handler)); RETURN_TRUE; } +/* }}} */ + static int copy_class_name(zend_class_entry *ce, zval *array) { |