php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove dead code and sillyness (#13322)

Browse Source
This commit is contained in:
K
2024-02-04 21:25:59 +00:00
committed by GitHub
parent 5a76b4f470
commit 47b05def96
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sapi/phpdbg/phpdbg_watch.c
View File

@@ -350,7 +350,7 @@ void phpdbg_set_addr_watchpoint(void *addr, size_t size, phpdbg_watchpoint_t *wa
watch->size = size;
watch->ref = NULL;
watch->coll = NULL;
zend_hash_init(&watch->elements, 8, brml, NULL, 0);
zend_hash_init(&watch->elements, 8, NULL, NULL, 0);
}
void phpdbg_set_zval_watchpoint(zval *zv, phpdbg_watchpoint_t *watch) {
@@ -460,7 +460,7 @@ void phpdbg_update_watch_ref(phpdbg_watchpoint_t *watch) {
coll->reference.addr.ptr = NULL;
}
zend_hash_init(&coll->parents, 8, shitty stupid parameter, NULL, 0);
zend_hash_init(&coll->parents, 8, NULL, NULL, 0);
zend_hash_index_add_ptr(&PHPDBG_G(watch_collisions), (zend_ulong) watch->ref, coll);
}
zend_hash_index_add_ptr(&coll->parents, (zend_long) watch, watch);
@@ -484,7 +484,7 @@ void phpdbg_update_watch_ref(phpdbg_watchpoint_t *watch) {
phpdbg_activate_watchpoint(&coll->ref);
phpdbg_watch_backup_data(&coll->ref);
zend_hash_init(&coll->parents, 8, shitty stupid parameter, NULL, 0);
zend_hash_init(&coll->parents, 8, NULL, NULL, 0);
zend_hash_index_add_ptr(&PHPDBG_G(watch_collisions), (zend_ulong) watch->ref, coll);
}
zend_hash_index_add_ptr(&coll->parents, (zend_long) watch, watch);
@@ -642,14 +642,13 @@ void phpdbg_recurse_watch_element(phpdbg_watch_element *element) {
void phpdbg_watch_parent_ht(phpdbg_watch_element *element) {
if (element->watch->type == WATCH_ON_BUCKET) {
phpdbg_btree_result *res;
HashPosition pos;
phpdbg_watch_ht_info *hti;
ZEND_ASSERT(element->parent_container);
if (!(res = phpdbg_btree_find(&PHPDBG_G(watch_HashTables), (zend_ulong) element->parent_container))) {
hti = emalloc(sizeof(*hti));
hti->ht = element->parent_container;
zend_hash_init(&hti->watches, 0, grrrrr, ZVAL_PTR_DTOR, 0);
zend_hash_init(&hti->watches, 0, NULL, ZVAL_PTR_DTOR, 0);
phpdbg_btree_insert(&PHPDBG_G(watch_HashTables), (zend_ulong) hti->ht, hti);
phpdbg_set_addr_watchpoint(HT_GET_DATA_ADDR(hti->ht), HT_HASH_SIZE(hti->ht->nTableMask), &hti->hash_watch);
@@ -660,11 +659,6 @@ void phpdbg_watch_parent_ht(phpdbg_watch_element *element) {
hti = (phpdbg_watch_ht_info *) res->ptr;
}
zend_hash_internal_pointer_end_ex(hti->ht, &pos);
hti->last = hti->ht->arData + pos;
hti->last_str = hti->last->key;
hti->last_idx = hti->last->h;
zend_hash_add_ptr(&hti->watches, element->name_in_parent, element);
}
}

5
sapi/phpdbg/phpdbg_watch.h
View File

@@ -106,12 +106,7 @@ typedef struct _phpdbg_watch_element {
typedef struct {
/* to watch rehashes (yes, this is not *perfect*, but good enough for everything in PHP...) */
phpdbg_watchpoint_t hash_watch; /* must be first element */
Bucket *last;
zend_string *last_str;
zend_ulong last_idx;
HashTable *ht;
size_t data_size;
HashTable watches; /* contains phpdbg_watch_element */
} phpdbg_watch_ht_info;