archived
/
ext-collections
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

replace tabs with spaces

This commit is contained in:
CismonX 2018-08-26 20:59:47 +08:00
parent 5fe6912bc4
commit 683169af80
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/collections_methods.c
View File

@ -316,47 +316,47 @@ static zend_always_inline void zend_hash_sort_by(zend_array* ht)
uint32_t i; uint32_t i;
if (HT_IS_WITHOUT_HOLES(ht)) if (HT_IS_WITHOUT_HOLES(ht))
{ {
i = ht->nNumUsed; i = ht->nNumUsed;
} }
else else
{ {
uint32_t j; uint32_t j;
for (j = 0, i = 0; j < ht->nNumUsed; j++) for (j = 0, i = 0; j < ht->nNumUsed; j++)
{ {
Bucket *p = ht->arData + j; Bucket *p = ht->arData + j;
if (UNEXPECTED(Z_TYPE(p->val) == IS_UNDEF)) if (UNEXPECTED(Z_TYPE(p->val) == IS_UNDEF))
{ {
continue; continue;
} }
if (i != j) if (i != j)
{ {
ht->arData[i] = *p; ht->arData[i] = *p;
} }
i++; i++;
} }
} }
uint32_t num_elements = zend_hash_num_elements(ht); uint32_t num_elements = zend_hash_num_elements(ht);
if (num_elements > 1) if (num_elements > 1)
{ {
zend_sort(ht->arData, i, sizeof(Bucket), bucket_compare_by, zend_sort(ht->arData, i, sizeof(Bucket), bucket_compare_by,
(swap_func_t)zend_hash_bucket_packed_swap); (swap_func_t)zend_hash_bucket_packed_swap);
ht->nNumUsed = i; ht->nNumUsed = i;
} }
HashPosition idx = 0; HashPosition idx = 0;
ZEND_HASH_FOREACH_BUCKET(ht, Bucket* bucket) ZEND_HASH_FOREACH_BUCKET(ht, Bucket* bucket)
bucket->h = idx++; bucket->h = idx++;
ZEND_HASH_FOREACH_END(); ZEND_HASH_FOREACH_END();
if (!HT_IS_PACKED(ht)) if (!HT_IS_PACKED(ht))
{ {
void *new_data, *old_data = HT_GET_DATA_ADDR(ht); void *new_data, *old_data = HT_GET_DATA_ADDR(ht);
Bucket *old_buckets = ht->arData; Bucket *old_buckets = ht->arData;
new_data = pemalloc(HT_SIZE_EX(ht->nTableSize, HT_MIN_MASK), HT_IS_PERSISTENT(ht)); new_data = pemalloc(HT_SIZE_EX(ht->nTableSize, HT_MIN_MASK), HT_IS_PERSISTENT(ht));
ht->u.flags |= HASH_FLAG_PACKED | HASH_FLAG_STATIC_KEYS; ht->u.flags |= HASH_FLAG_PACKED | HASH_FLAG_STATIC_KEYS;
ht->nTableMask = HT_MIN_MASK; ht->nTableMask = HT_MIN_MASK;
HT_SET_DATA_ADDR(ht, new_data); HT_SET_DATA_ADDR(ht, new_data);
memcpy(ht->arData, old_buckets, sizeof(Bucket) * ht->nNumUsed); memcpy(ht->arData, old_buckets, sizeof(Bucket) * ht->nNumUsed);
pefree(old_data, HT_IS_PERSISTENT(ht)); pefree(old_data, HT_IS_PERSISTENT(ht));
HT_HASH_RESET_PACKED(ht); HT_HASH_RESET_PACKED(ht);
} }
} }