From 97887e37168c73fb028a4b58bf59010e6217ef7b Mon Sep 17 00:00:00 2001 From: Bob Weinand Date: Sat, 21 Mar 2015 20:36:30 +0100 Subject: Stabilize (simple) watchpoints with IS_INDIRECT/IS_REFERENCE situations --- sapi/phpdbg/phpdbg_watch.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'sapi/phpdbg/phpdbg_watch.h') diff --git a/sapi/phpdbg/phpdbg_watch.h b/sapi/phpdbg/phpdbg_watch.h index 2736b1df64..d101ab116d 100644 --- a/sapi/phpdbg/phpdbg_watch.h +++ b/sapi/phpdbg/phpdbg_watch.h @@ -21,7 +21,6 @@ #ifndef PHPDBG_WATCH_H #define PHPDBG_WATCH_H -#include "TSRM.h" #include "phpdbg_cmd.h" #ifdef _WIN32 @@ -41,6 +40,7 @@ extern const phpdbg_command_t phpdbg_watch_commands[]; /* Watchpoint functions/typedefs */ +/* References are managed through their parent zval *, being a simple WATCH_ON_ZVAL and eventually WATCH_ON_REFCOUNTED */ typedef enum { WATCH_ON_ZVAL, WATCH_ON_HASHTABLE, @@ -66,11 +66,10 @@ struct _phpdbg_watchpoint_t { phpdbg_watchtype type; char flags; phpdbg_watchpoint_t *parent; + phpdbg_watchpoint_t *reference; HashTable *parent_container; - char *name_in_parent; - size_t name_in_parent_len; - char *str; - size_t str_len; + zend_string *name_in_parent; + zend_string *str; }; typedef struct { -- cgit v1.2.1