Convert resources to objects in ext/zlib #5680
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kocsismate
commented
Jun 7, 2020
| @@ -47,6 +47,7 @@ typedef struct _php_zlib_context { | |||
| int status; | |||
| size_t inflateDictlen; | |||
| php_zlib_buffer buffer; | |||
| zend_object std; | |||
| } php_zlib_context; | |||
There was a problem hiding this comment.
Apparently, the same data structure is used during inflation and deflation... Which leads to the question if we should separate it to a zlib_inflate_context and a zlib_deflate_context?
| le_deflate = zend_register_list_destructors_ex(deflate_rsrc_dtor, NULL, "zlib.deflate", module_number); | ||
| le_inflate = zend_register_list_destructors_ex(inflate_rsrc_dtor, NULL, "zlib.inflate", module_number); | ||
| zend_class_entry inflate_ce; | ||
| INIT_CLASS_ENTRY(inflate_ce, "InflateContext", class_InflateContext_methods); |
There was a problem hiding this comment.
I'm wondering if InflateContext is really a good naming choice: if we later want to add an OO API, then InflateContext::add seems a bit weird for me. Maybe we should prefer Inflator/Deflator?
kocsismate
commented
Jun 7, 2020
| deflate_add(): supplied resource is not a valid zlib deflate resource | ||
| Flush mode must be ZLIB_NO_FLUSH, ZLIB_PARTIAL_FLUSH, ZLIB_SYNC_FLUSH, ZLIB_FULL_FLUSH, ZLIB_BLOCK or ZLIB_FINISH | ||
| deflate_add(): Argument #1 ($context) must be of type DeflateContext, resource given | ||
| deflate_add(): Argument #3 ($flush_behavior) must be one of ZLIB_NO_FLUSH, ZLIB_PARTIAL_FLUSH, ZLIB_SYNC_FLUSH, ZLIB_FULL_FLUSH, ZLIB_BLOCK, or ZLIB_FINISH |
There was a problem hiding this comment.
I'll commit these error message changes separately
kocsismate
force-pushed
the
zlib-resource
branch
from
364352f to
a75e120
Compare
41 tasks
nikic
approved these changes
Jun 17, 2020
| @@ -930,71 +978,69 @@ PHP_FUNCTION(inflate_add) | |||
| break; | |||
|
|
|||
| default: | |||
| zend_value_error( | |||
| "Flush mode must be ZLIB_NO_FLUSH, ZLIB_PARTIAL_FLUSH, ZLIB_SYNC_FLUSH, ZLIB_FULL_FLUSH, ZLIB_BLOCK or ZLIB_FINISH"); | |||
| zend_argument_value_error(3, "must be one of ZLIB_NO_FLUSH, ZLIB_PARTIAL_FLUSH, ZLIB_SYNC_FLUSH, ZLIB_FULL_FLUSH, ZLIB_BLOCK, ZLIB_FINISH"); | |||
There was a problem hiding this comment.
I think the or should be retained here.
There was a problem hiding this comment.
Fixed these in the commit to master
| out = zend_string_realloc(out, buffer_used, 0); | ||
| ZSTR_VAL(out)[buffer_used] = 0; | ||
| RETURN_STR(out); | ||
| complete: { |
There was a problem hiding this comment.
You can drop the awkward code block here.
| le_deflate = zend_register_list_destructors_ex(deflate_rsrc_dtor, NULL, "zlib.deflate", module_number); | ||
| le_inflate = zend_register_list_destructors_ex(inflate_rsrc_dtor, NULL, "zlib.inflate", module_number); | ||
| zend_class_entry inflate_ce; | ||
| INIT_CLASS_ENTRY(inflate_ce, "InflateContext", class_InflateContext_methods); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.