diff options
| author | Marcus Boerger <helly@php.net> | 2006-05-09 23:53:23 +0000 |
|---|---|---|
| committer | Marcus Boerger <helly@php.net> | 2006-05-09 23:53:23 +0000 |
| commit | 637a40423cd7632b2800814c2ba3ad9b95bbd2f4 (patch) | |
| tree | 485f1dd7cf12d0bfe693961120360b965d66c195 /Zend/zend_exceptions.h | |
| parent | 57184454e9e3ccecb2b55dc71cd7dc1aa65a3ad3 (diff) | |
| download | php-git-637a40423cd7632b2800814c2ba3ad9b95bbd2f4.tar.gz | |
- MFH as discussed
. zend_exception_get_default() -> zend_exception_get_default(TSRMLS_D)
. zend_get_error_exception() -> zend_get_error_exception(TSRMLS_D)
. added E_RECOVERABLE_ERROR
. added ZEND_TOSTRING_FUNC_NAME
. added __tostring function cache to zend_class_entry
. added ZEND_NAMED_ME
. modified ZEND_ME_MAPPING to support method flags
. added ZEND_MN
. method entries now use prefix "zim_" instead of "zif_"
. drop EG(ze1_compatibility_mode)
. changed cast handler, now without (int should_free):
typedef int (*zend_object_cast_t)(zval *readobj, zval *retval, int type TSRMLS_DC);
. changed get_iterator, now receives whether value is by ref:
zend_object_iterator *(*get_iterator)(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC);
. added zend_objects_store_add_ref_by_handle
. added zend_objects_store_del_ref_by_handle
. convert_to_explicit_type(pzv, type)
Diffstat (limited to 'Zend/zend_exceptions.h')
| -rw-r--r-- | Zend/zend_exceptions.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Zend/zend_exceptions.h b/Zend/zend_exceptions.h index 998fff438e..fabe56252c 100644 --- a/Zend/zend_exceptions.h +++ b/Zend/zend_exceptions.h @@ -30,11 +30,11 @@ void zend_throw_exception_internal(zval *exception TSRMLS_DC); void zend_register_default_exception(TSRMLS_D); -ZEND_API zend_class_entry *zend_exception_get_default(void); -ZEND_API zend_class_entry *zend_get_error_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); -/* exception_ce NULL or zend_exception_get_default() or a derived class +/* 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, char *message, long code TSRMLS_DC); ZEND_API zval * zend_throw_exception_ex(zend_class_entry *exception_ce, long code TSRMLS_DC, char *format, ...); @@ -48,6 +48,9 @@ extern ZEND_API void (*zend_throw_exception_hook)(zval *ex TSRMLS_DC); /* show an exception using zend_error(E_ERROR,...) */ ZEND_API void zend_exception_error(zval *exception TSRMLS_DC); +/* do not export, in php it's available thru spprintf directly */ +int zend_spprintf(char **message, int max_len, char *format, ...); + END_EXTERN_C() #endif |