diff options
Diffstat (limited to 'Zend/zend_exceptions.h')
| -rw-r--r-- | Zend/zend_exceptions.h | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/Zend/zend_exceptions.h b/Zend/zend_exceptions.h index 9e18a45b0b..e223108efd 100644 --- a/Zend/zend_exceptions.h +++ b/Zend/zend_exceptions.h @@ -5,7 +5,7 @@ | Copyright (c) 1998-2015 Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ | This source file is subject to version 2.00 of the Zend license, | - | that is bundled with this package in the file LICENSE, and is | + | that is bundled with this package in the file LICENSE, and is | | available through the world-wide-web at the following url: | | http://www.zend.com/license/2_00.txt. | | If you did not receive a copy of the Zend license and are unable to | @@ -26,34 +26,35 @@ BEGIN_EXTERN_C() -ZEND_API void zend_exception_set_previous(zval *exception, zval *add_previous TSRMLS_DC); -ZEND_API void zend_exception_save(TSRMLS_D); -ZEND_API void zend_exception_restore(TSRMLS_D); +ZEND_API void zend_exception_set_previous(zend_object *exception, zend_object *add_previous); +ZEND_API void zend_exception_save(void); +ZEND_API void zend_exception_restore(void); -void zend_throw_exception_internal(zval *exception TSRMLS_DC); +ZEND_API void zend_throw_exception_internal(zval *exception); -void zend_register_default_exception(TSRMLS_D); +void zend_register_default_exception(void); -ZEND_API zend_class_entry *zend_exception_get_default(TSRMLS_D); -ZEND_API zend_class_entry *zend_get_error_exception(TSRMLS_D); -ZEND_API void zend_register_default_classes(TSRMLS_D); +ZEND_API zend_class_entry *zend_exception_get_default(void); +ZEND_API zend_class_entry *zend_get_error_exception(void); +ZEND_API void zend_register_default_classes(void); /* exception_ce NULL or zend_exception_get_default() or a derived class * message NULL or the message of the exception */ -ZEND_API zval * zend_throw_exception(zend_class_entry *exception_ce, const char *message, long code TSRMLS_DC); -ZEND_API zval * zend_throw_exception_ex(zend_class_entry *exception_ce, long code TSRMLS_DC, const char *format, ...); -ZEND_API void zend_throw_exception_object(zval *exception TSRMLS_DC); -ZEND_API void zend_clear_exception(TSRMLS_D); +ZEND_API zend_object *zend_throw_exception(zend_class_entry *exception_ce, const char *message, zend_long code); +ZEND_API zend_object *zend_throw_exception_ex(zend_class_entry *exception_ce, zend_long code, const char *format, ...); +ZEND_API void zend_throw_exception_object(zval *exception); +ZEND_API void zend_clear_exception(void); -ZEND_API zval * zend_throw_error_exception(zend_class_entry *exception_ce, const char *message, long code, int severity TSRMLS_DC); +ZEND_API zend_object *zend_throw_error_exception(zend_class_entry *exception_ce, const char *message, zend_long code, int severity); -extern ZEND_API void (*zend_throw_exception_hook)(zval *ex TSRMLS_DC); +extern ZEND_API void (*zend_throw_exception_hook)(zval *ex); /* show an exception using zend_error(severity,...), severity should be E_ERROR */ -ZEND_API void zend_exception_error(zval *exception, int severity TSRMLS_DC); +ZEND_API void zend_exception_error(zend_object *exception, int severity); /* do not export, in php it's available thru spprintf directly */ -int zend_spprintf(char **message, int max_len, const char *format, ...); +size_t zend_spprintf(char **message, size_t max_len, const char *format, ...); +zend_string *zend_strpprintf(size_t max_len, const char *format, ...); END_EXTERN_C() |