Skip to content

Commit e86cdce

Browse files
rjhdbynikic
rjhdby
authored and
nikic
committed
Make zend_hash_sort() return void
This function always succeeds, so remove the success indicator return value.
1 parent 8ccdb82 commit e86cdce

File tree

6 files changed

+23
-43
lines changed

6 files changed

+23
-43
lines changed

‎Zend/zend_hash.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2459,7 +2459,7 @@ ZEND_API void zend_hash_bucket_packed_swap(Bucket *p, Bucket *q)
24592459
q->h = h;
24602460
}
24612461

2462-
ZEND_API int ZEND_FASTCALL zend_hash_sort_ex(HashTable *ht, sort_func_t sort, compare_func_t compar, zend_bool renumber)
2462+
ZEND_API void ZEND_FASTCALL zend_hash_sort_ex(HashTable *ht, sort_func_t sort, compare_func_t compar, zend_bool renumber)
24632463
{
24642464
Bucket *p;
24652465
uint32_t i, j;
@@ -2468,7 +2468,7 @@ ZEND_API int ZEND_FASTCALL zend_hash_sort_ex(HashTable *ht, sort_func_t sort, co
24682468
HT_ASSERT_RC1(ht);
24692469

24702470
if (!(ht->nNumOfElements>1) && !(renumber && ht->nNumOfElements>0)) { /* Doesn't require sorting */
2471-
return SUCCESS;
2471+
return;
24722472
}
24732473

24742474
if (HT_IS_WITHOUT_HOLES(ht)) {
@@ -2523,8 +2523,6 @@ ZEND_API int ZEND_FASTCALL zend_hash_sort_ex(HashTable *ht, sort_func_t sort, co
25232523
zend_hash_rehash(ht);
25242524
}
25252525
}
2526-
2527-
return SUCCESS;
25282526
}
25292527

25302528
static zend_always_inline int zend_hash_compare_impl(HashTable *ht1, HashTable *ht2, compare_func_t compar, zend_bool ordered) {

‎Zend/zend_hash.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ ZEND_API void zend_hash_bucket_swap(Bucket *p, Bucket *q);
262262
ZEND_API void zend_hash_bucket_renum_swap(Bucket *p, Bucket *q);
263263
ZEND_API void zend_hash_bucket_packed_swap(Bucket *p, Bucket *q);
264264
ZEND_API int zend_hash_compare(HashTable *ht1, HashTable *ht2, compare_func_t compar, zend_bool ordered);
265-
ZEND_API int ZEND_FASTCALL zend_hash_sort_ex(HashTable *ht, sort_func_t sort_func, compare_func_t compare_func, zend_bool renumber);
265+
ZEND_API void ZEND_FASTCALL zend_hash_sort_ex(HashTable *ht, sort_func_t sort_func, compare_func_t compare_func, zend_bool renumber);
266266
ZEND_API zval* ZEND_FASTCALL zend_hash_minmax(const HashTable *ht, compare_func_t compar, uint32_t flag);
267267

268268
#define zend_hash_sort(ht, compare_func, renumber) \

‎Zend/zend_ts_hash.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -264,15 +264,11 @@ ZEND_API void zend_ts_hash_merge_ex(TsHashTable *target, TsHashTable *source, co
264264
end_read(source);
265265
}
266266

267-
ZEND_API int zend_ts_hash_sort(TsHashTable *ht, sort_func_t sort_func, compare_func_t compare_func, int renumber)
267+
ZEND_API void zend_ts_hash_sort(TsHashTable *ht, sort_func_t sort_func, compare_func_t compare_func, int renumber)
268268
{
269-
int retval;
270-
271269
begin_write(ht);
272-
retval = zend_hash_sort_ex(TS_HASH(ht), sort_func, compare_func, renumber);
270+
zend_hash_sort_ex(TS_HASH(ht), sort_func, compare_func, renumber);
273271
end_write(ht);
274-
275-
return retval;
276272
}
277273

278274
ZEND_API int zend_ts_hash_compare(TsHashTable *ht1, TsHashTable *ht2, compare_func_t compar, zend_bool ordered)

‎Zend/zend_ts_hash.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ ZEND_API void zend_ts_hash_copy(TsHashTable *target, TsHashTable *source, copy_c
7373
ZEND_API void zend_ts_hash_copy_to_hash(HashTable *target, TsHashTable *source, copy_ctor_func_t pCopyConstructor);
7474
ZEND_API void zend_ts_hash_merge(TsHashTable *target, TsHashTable *source, copy_ctor_func_t pCopyConstructor, int overwrite);
7575
ZEND_API void zend_ts_hash_merge_ex(TsHashTable *target, TsHashTable *source, copy_ctor_func_t pCopyConstructor, merge_checker_func_t pMergeSource, void *pParam);
76-
ZEND_API int zend_ts_hash_sort(TsHashTable *ht, sort_func_t sort_func, compare_func_t compare_func, int renumber);
76+
ZEND_API void zend_ts_hash_sort(TsHashTable *ht, sort_func_t sort_func, compare_func_t compare_func, int renumber);
7777
ZEND_API int zend_ts_hash_compare(TsHashTable *ht1, TsHashTable *ht2, compare_func_t compar, zend_bool ordered);
7878
ZEND_API zval *zend_ts_hash_minmax(TsHashTable *ht, compare_func_t compar, int flag);
7979

‎ext/phar/dirstream.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,7 @@ static php_stream *phar_make_dirstream(char *dir, HashTable *manifest) /* {{{ */
285285

286286
if (FAILURE != zend_hash_has_more_elements(data)) {
287287
efree(dir);
288-
if (zend_hash_sort(data, phar_compare_dir_name, 0) == FAILURE) {
289-
FREE_HASHTABLE(data);
290-
return NULL;
291-
}
288+
zend_hash_sort(data, phar_compare_dir_name, 0);
292289
return php_stream_alloc(&phar_dir_ops, data, NULL, "r");
293290
} else {
294291
efree(dir);

‎ext/standard/array.c

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -708,9 +708,8 @@ PHP_FUNCTION(krsort)
708708

709709
cmp = php_get_key_compare_func(sort_type, 1);
710710

711-
if (zend_hash_sort(Z_ARRVAL_P(array), cmp, 0) == FAILURE) {
712-
RETURN_FALSE;
713-
}
711+
zend_hash_sort(Z_ARRVAL_P(array), cmp, 0);
712+
714713
RETURN_TRUE;
715714
}
716715
/* }}} */
@@ -731,9 +730,8 @@ PHP_FUNCTION(ksort)
731730

732731
cmp = php_get_key_compare_func(sort_type, 0);
733732

734-
if (zend_hash_sort(Z_ARRVAL_P(array), cmp, 0) == FAILURE) {
735-
RETURN_FALSE;
736-
}
733+
zend_hash_sort(Z_ARRVAL_P(array), cmp, 0);
734+
737735
RETURN_TRUE;
738736
}
739737
/* }}} */
@@ -835,13 +833,9 @@ static void php_natsort(INTERNAL_FUNCTION_PARAMETERS, int fold_case) /* {{{ */
835833
ZEND_PARSE_PARAMETERS_END();
836834

837835
if (fold_case) {
838-
if (zend_hash_sort(Z_ARRVAL_P(array), php_array_natural_case_compare, 0) == FAILURE) {
839-
return;
840-
}
836+
zend_hash_sort(Z_ARRVAL_P(array), php_array_natural_case_compare, 0);
841837
} else {
842-
if (zend_hash_sort(Z_ARRVAL_P(array), php_array_natural_compare, 0) == FAILURE) {
843-
return;
844-
}
838+
zend_hash_sort(Z_ARRVAL_P(array), php_array_natural_compare, 0);
845839
}
846840

847841
RETURN_TRUE;
@@ -880,9 +874,8 @@ PHP_FUNCTION(asort)
880874

881875
cmp = php_get_data_compare_func(sort_type, 0);
882876

883-
if (zend_hash_sort(Z_ARRVAL_P(array), cmp, 0) == FAILURE) {
884-
RETURN_FALSE;
885-
}
877+
zend_hash_sort(Z_ARRVAL_P(array), cmp, 0);
878+
886879
RETURN_TRUE;
887880
}
888881
/* }}} */
@@ -903,9 +896,8 @@ PHP_FUNCTION(arsort)
903896

904897
cmp = php_get_data_compare_func(sort_type, 1);
905898

906-
if (zend_hash_sort(Z_ARRVAL_P(array), cmp, 0) == FAILURE) {
907-
RETURN_FALSE;
908-
}
899+
zend_hash_sort(Z_ARRVAL_P(array), cmp, 0);
900+
909901
RETURN_TRUE;
910902
}
911903
/* }}} */
@@ -926,9 +918,8 @@ PHP_FUNCTION(sort)
926918

927919
cmp = php_get_data_compare_func(sort_type, 0);
928920

929-
if (zend_hash_sort(Z_ARRVAL_P(array), cmp, 1) == FAILURE) {
930-
RETURN_FALSE;
931-
}
921+
zend_hash_sort(Z_ARRVAL_P(array), cmp, 1);
922+
932923
RETURN_TRUE;
933924
}
934925
/* }}} */
@@ -949,9 +940,8 @@ PHP_FUNCTION(rsort)
949940

950941
cmp = php_get_data_compare_func(sort_type, 1);
951942

952-
if (zend_hash_sort(Z_ARRVAL_P(array), cmp, 1) == FAILURE) {
953-
RETURN_FALSE;
954-
}
943+
zend_hash_sort(Z_ARRVAL_P(array), cmp, 1);
944+
955945
RETURN_TRUE;
956946
}
957947
/* }}} */
@@ -1021,7 +1011,6 @@ static void php_usort(INTERNAL_FUNCTION_PARAMETERS, compare_func_t compare_func,
10211011
{
10221012
zval *array;
10231013
zend_array *arr;
1024-
zend_bool retval;
10251014
PHP_ARRAY_CMP_FUNC_VARS;
10261015

10271016
PHP_ARRAY_CMP_FUNC_BACKUP();
@@ -1040,13 +1029,13 @@ static void php_usort(INTERNAL_FUNCTION_PARAMETERS, compare_func_t compare_func,
10401029
/* Copy array, so the in-place modifications will not be visible to the callback function */
10411030
arr = zend_array_dup(arr);
10421031

1043-
retval = zend_hash_sort(arr, compare_func, renumber) != FAILURE;
1032+
zend_hash_sort(arr, compare_func, renumber);
10441033

10451034
zval_ptr_dtor(array);
10461035
ZVAL_ARR(array, arr);
10471036

10481037
PHP_ARRAY_CMP_FUNC_RESTORE();
1049-
RETURN_BOOL(retval);
1038+
RETURN_TRUE;
10501039
}
10511040
/* }}} */
10521041

0 commit comments

Comments
 (0)