Cleanup resource handling APIs #1042
Merged
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
Member
laruence
commented
Feb 2, 2015
laruence
commented
- Drop ZEND_REGISTER/FETCH_RESOURCE
- Avoiding double checking of passed_id's type
- Resource types are passed by registers now.
| } | ||
|
|
||
| ZEND_API void *zend_fetch_resource(zval *passed_id, int default_id, const char *resource_type_name, int *found_resource_type, int num_resource_types, ...) | ||
| ZEND_API void *zend_fetch_resource2(zend_resource *res, const char *resource_type_name, int *found_type, int resource_type1, int resource_type2) |
There was a problem hiding this comment.
We may remove "found_type" argument and use res->type in caller context instead.
We also may use res->ptr instead of returned value.
In this case we may change this function into zend_verify_resource().
There was a problem hiding this comment.
- make sense....
- we need to return a flag to tell if it is expected type
| @@ -2765,7 +2765,9 @@ PHP_FUNCTION(curl_setopt) | |||
| return; | |||
| } | |||
|
|
|||
| ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl); | |||
| if ((ch = (php_curl*)zend_fetch_resource(Z_RES_P(zid), le_curl_name, le_curl)) == NULL) { | |||
There was a problem hiding this comment.
I don't see how three lines of code instead of one is an improvement.
There was a problem hiding this comment.
the improvement is that we use zend_resource directly as parameters.
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.