diff options
| author | Zeev Suraski <zeev@php.net> | 2000-04-29 11:55:20 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2000-04-29 11:55:20 +0000 |
| commit | 5ef03c4ff88465b29bdf6bdb6401c29300d813fc (patch) | |
| tree | a2628b286bee82eb1efd8728748a81c58ed83667 | |
| parent | 96c648c9f703ef77f031746e01f51172738b7897 (diff) | |
| download | php-git-5ef03c4ff88465b29bdf6bdb6401c29300d813fc.tar.gz | |
Pass the op_array to the ctor/dtor, instead of just the resource
| -rw-r--r-- | Zend/zend_extensions.h | 4 | ||||
| -rw-r--r-- | Zend/zend_opcode.c | 12 |
2 files changed, 4 insertions, 12 deletions
diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h index 9053e3fe02..b44543e201 100644 --- a/Zend/zend_extensions.h +++ b/Zend/zend_extensions.h @@ -55,8 +55,8 @@ struct _zend_extension { void (*fcall_begin_handler)(zend_op_array *op_array); void (*fcall_end_handler)(zend_op_array *op_array); - void (*op_array_ctor)(void **resource); - void (*op_array_dtor)(void **resource); + void (*op_array_ctor)(zend_op_array *op_array); + void (*op_array_dtor)(zend_op_array *op_array); void *reserved1; void *reserved2; diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index fe768da137..4bb112b63a 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -30,11 +30,7 @@ static void zend_extension_op_array_ctor_handler(zend_extension *extension, zend_op_array *op_array) { if (extension->op_array_ctor) { - if (extension->resource_number>=0) { - extension->op_array_ctor(&op_array->reserved[extension->resource_number]); - } else { - extension->op_array_ctor(NULL); - } + extension->op_array_ctor(op_array); } } @@ -42,11 +38,7 @@ static void zend_extension_op_array_ctor_handler(zend_extension *extension, zend static void zend_extension_op_array_dtor_handler(zend_extension *extension, zend_op_array *op_array) { if (extension->op_array_dtor) { - if (extension->resource_number>=0) { - extension->op_array_dtor(&op_array->reserved[extension->resource_number]); - } else { - extension->op_array_dtor(NULL); - } + extension->op_array_dtor(op_array); } } |