Skip to content

zend_hash.h: return true/false from bool functions #22162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DanielEScherzer wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −8
Open

zend_hash.h: return true/false from bool functions #22162

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Zend/zend_hash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,14 +404,14 @@ static zend_always_inline bool _zend_handle_numeric_str(const char *key, size_t
const char *tmp = key;

if (EXPECTED(*tmp > '9')) {
return 0;
return false;
} else if (*tmp < '0') {
if (*tmp != '-') {
return 0;
return false;
}
tmp++;
if (*tmp > '9' || *tmp < '0') {
return 0;
return false;
}
}
return _zend_handle_numeric_str_ex(key, length, idx);
Expand Down Expand Up @@ -1605,30 +1605,30 @@ static zend_always_inline bool zend_array_is_list(const zend_array *array)
zend_string* str_idx;
/* Empty arrays are lists */
if (zend_hash_num_elements(array) == 0) {
return 1;
return true;
}

/* Packed arrays are lists */
if (HT_IS_PACKED(array)) {
if (HT_IS_WITHOUT_HOLES(array)) {
return 1;
return true;
}
/* Check if the list could theoretically be repacked */
ZEND_HASH_PACKED_FOREACH_KEY(array, num_idx) {
if (num_idx != expected_idx++) {
return 0;
return false;
}
} ZEND_HASH_FOREACH_END();
} else {
/* Check if the list could theoretically be repacked */
ZEND_HASH_MAP_FOREACH_KEY(array, num_idx, str_idx) {
if (str_idx != NULL || num_idx != expected_idx++) {
return 0;
return false;
}
} ZEND_HASH_FOREACH_END();
}

return 1;
return true;
}


Expand Down
Loading