com php-src: Return SUCCESS and do not confuse use with errors: phpdbg_watch.c
| From: | Bob Weinand | Date: | Mon, 14 Apr 2014 14:26:27 +0000 |
| Subject: | com php-src: Return SUCCESS and do not confuse use with errors: phpdbg_watch.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-76992@lists.php.net to get a copy of this message | ||
Commit: 2dad85ae61bbc2817798cb98680abfabd9e19d33
Author: Bob Weinand <bobwei9@hotmail.com> Mon, 14 Apr 2014 16:26:27 +0200
Parents: 8c22352e885986096f0293bddf57feddbdeac335
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2dad85ae61bbc2817798cb98680abfabd9e19d33
Log:
Return SUCCESS and do not confuse use with errors
Changed paths:
M phpdbg_watch.c
Diff:
diff --git a/phpdbg_watch.c b/phpdbg_watch.c
index b0edcef..41c5788 100644
--- a/phpdbg_watch.c
+++ b/phpdbg_watch.c
@@ -400,8 +400,8 @@ static int phpdbg_watchpoint_parse_symtables(char *input, size_t len, int (*call
zend_hash_add(EG(active_symbol_table), "this", sizeof("this"), &EG(This),
sizeof(zval *), NULL);
}
- if (zend_is_auto_global(input, len TSRMLS_CC)) {
- phpdbg_watchpoint_parse_input(input, len, &EG(symbol_table), 0, callback, 1 TSRMLS_CC);
+ if (zend_is_auto_global(input, len TSRMLS_CC) && phpdbg_watchpoint_parse_input(input, len,
&EG(symbol_table), 0, callback, 1 TSRMLS_CC) != FAILURE) {
+ return SUCCESS;
}
return phpdbg_watchpoint_parse_input(input, len, EG(active_symbol_table), 0, callback, 0
TSRMLS_CC);