clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change fetch_type from int to uint32_t (#9152)

Browse Source 
This is because it is derived from the opcode num which is an uint32_t
This commit is contained in:
George Peter Banyard 2022-07-28 21:03:09 +01:00 committed by GitHub
parent ba9debb544
commit 6b160e78a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Zend/zend_execute.h
View File

@ -349,9 +349,9 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_cannot_pass_by_reference(uint32_t arg
ZEND_API void zend_set_timeout(zend_long seconds, bool reset_signals);
ZEND_API void zend_unset_timeout(void);
ZEND_API ZEND_NORETURN void ZEND_FASTCALL zend_timeout(void);
ZEND_API zend_class_entry *zend_fetch_class(zend_string *class_name, int fetch_type);
ZEND_API zend_class_entry *zend_fetch_class_with_scope(zend_string *class_name, int fetch_type, zend_class_entry *scope);
ZEND_API zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, zend_string *lcname, int fetch_type);
ZEND_API zend_class_entry *zend_fetch_class(zend_string *class_name, uint32_t fetch_type);
ZEND_API zend_class_entry *zend_fetch_class_with_scope(zend_string *class_name, uint32_t fetch_type, zend_class_entry *scope);
ZEND_API zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, zend_string *lcname, uint32_t fetch_type);
ZEND_API zend_function * ZEND_FASTCALL zend_fetch_function(zend_string *name);
ZEND_API zend_function * ZEND_FASTCALL zend_fetch_function_str(const char *name, size_t len);

10
Zend/zend_execute_API.c
View File

@ -1534,7 +1534,7 @@ void zend_unset_timeout(void) /* {{{ */
}
/* }}} */
static ZEND_COLD void report_class_fetch_error(zend_string *class_name, int fetch_type)
static ZEND_COLD void report_class_fetch_error(zend_string *class_name, uint32_t fetch_type)
{
if (fetch_type & ZEND_FETCH_CLASS_SILENT) {
return;
@ -1556,10 +1556,10 @@ static ZEND_COLD void report_class_fetch_error(zend_string *class_name, int fetc
}
}
zend_class_entry *zend_fetch_class(zend_string *class_name, int fetch_type) /* {{{ */
zend_class_entry *zend_fetch_class(zend_string *class_name, uint32_t fetch_type) /* {{{ */
{
zend_class_entry *ce, *scope;
int fetch_sub_type = fetch_type & ZEND_FETCH_CLASS_MASK;
uint32_t fetch_sub_type = fetch_type & ZEND_FETCH_CLASS_MASK;
check_fetch_type:
switch (fetch_sub_type) {
@ -1605,7 +1605,7 @@ check_fetch_type:
/* }}} */
zend_class_entry *zend_fetch_class_with_scope(
zend_string *class_name, int fetch_type, zend_class_entry *scope)
zend_string *class_name, uint32_t fetch_type, zend_class_entry *scope)
{
zend_class_entry *ce;
switch (fetch_type & ZEND_FETCH_CLASS_MASK) {
@ -1637,7 +1637,7 @@ zend_class_entry *zend_fetch_class_with_scope(
return ce;
}
zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, zend_string *key, int fetch_type) /* {{{ */
zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, zend_string *key, uint32_t fetch_type) /* {{{ */
{
zend_class_entry *ce = zend_lookup_class_ex(class_name, key, fetch_type);
if (!ce) {