diff options
Diffstat (limited to 'ext/zlib/zlib.c')
-rw-r--r-- | ext/zlib/zlib.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 75bd273526..02fb4dd207 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -788,7 +788,7 @@ PHP_ZLIB_DECODE_FUNC(gzdecode, PHP_ZLIB_ENCODING_GZIP); PHP_ZLIB_DECODE_FUNC(gzuncompress, PHP_ZLIB_ENCODING_DEFLATE); /* }}} */ -static zend_bool zlib_create_dictionary_string(HashTable *options, char **dict, size_t *dictlen) { +static bool zlib_create_dictionary_string(HashTable *options, char **dict, size_t *dictlen) { zval *option_buffer; if (options && (option_buffer = zend_hash_str_find(options, ZEND_STRL("dictionary"))) != NULL) { @@ -1337,10 +1337,7 @@ static PHP_MINIT_FUNCTION(zlib) php_output_handler_conflict_register(ZEND_STRL("ob_gzhandler"), php_zlib_output_conflict_check); php_output_handler_conflict_register(ZEND_STRL(PHP_ZLIB_OUTPUT_HANDLER_NAME), php_zlib_output_conflict_check); - zend_class_entry inflate_ce; - INIT_CLASS_ENTRY(inflate_ce, "InflateContext", class_InflateContext_methods); - inflate_context_ce = zend_register_internal_class(&inflate_ce); - inflate_context_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NO_DYNAMIC_PROPERTIES; + inflate_context_ce = register_class_InflateContext(); inflate_context_ce->create_object = inflate_context_create_object; inflate_context_ce->serialize = zend_class_serialize_deny; inflate_context_ce->unserialize = zend_class_unserialize_deny; @@ -1352,10 +1349,7 @@ static PHP_MINIT_FUNCTION(zlib) inflate_context_object_handlers.clone_obj = NULL; inflate_context_object_handlers.compare = zend_objects_not_comparable; - zend_class_entry deflate_ce; - INIT_CLASS_ENTRY(deflate_ce, "DeflateContext", class_DeflateContext_methods); - deflate_context_ce = zend_register_internal_class(&deflate_ce); - deflate_context_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NO_DYNAMIC_PROPERTIES; + deflate_context_ce = register_class_DeflateContext(); deflate_context_ce->create_object = deflate_context_create_object; deflate_context_ce->serialize = zend_class_serialize_deny; deflate_context_ce->unserialize = zend_class_unserialize_deny; |