com php-src: Fixed Bug #69733 (PHP fails to build with --enable-phpdbg-debug): sapi/phpdbg/phpdbg_bp.c

Commit: d2649af6b9e222bdece713d37ac9b15d722fa163 Author: Xinchen Hui <laruence@php.net> Sun, 31 May 2015 13:35:01 +0800 Parents: 66153ba153d5c9181403e63d95d71754c11f1c0b Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d2649af6b9e222bdece713d37ac9b15d722fa163 Log: Fixed Bug #69733 (PHP fails to build with --enable-phpdbg-debug) Bugs: https://bugs.php.net/69733 Changed paths: M sapi/phpdbg/phpdbg_bp.c Diff: diff --git a/sapi/phpdbg/phpdbg_bp.c b/sapi/phpdbg/phpdbg_bp.c index c8017a3..2e40e49 100644 --- a/sapi/phpdbg/phpdbg_bp.c +++ b/sapi/phpdbg/phpdbg_bp.c @@ -240,7 +240,7 @@ PHPDBG_API void phpdbg_set_breakpoint_file(const char *path, long line_num) /* { } path_len = strlen(path); - phpdbg_debug("file path: %s, resolved path: %s, was compiled: %d\n", original_path, path, zend_hash_exists(&PHPDBG_G(file_sources), path, path_len)); + phpdbg_debug("file path: %s, resolved path: %s, was compiled: %d\n", original_path, path, zend_hash_str_exists(&PHPDBG_G(file_sources), path, path_len)); if (!zend_hash_str_exists(&PHPDBG_G(file_sources), path, path_len)) { if (php_stream_stat_path(path, &ssb) == FAILURE) { @@ -308,7 +308,7 @@ PHPDBG_API void phpdbg_set_breakpoint_file(const char *path, long line_num) /* { PHPDBG_API HashTable *phpdbg_resolve_pending_file_break_ex(const char *file, uint filelen, zend_string *cur, HashTable *fileht) /* {{{ */ { - phpdbg_debug("file: %s, filelen: %u, cur: %s, curlen %u, pos: %c, memcmp: %d\n", file, filelen, cur, curlen, filelen > curlen ? file[filelen - curlen - 1] : '?', filelen > curlen ? memcmp(file + filelen - curlen, cur, curlen) : 0); + phpdbg_debug("file: %s, filelen: %u, cur: %s, curlen %u, pos: %c, memcmp: %d\n", file, filelen, cur->val, cur->len, filelen > cur->len ? file[filelen - cur->len - 1] : '?', filelen > cur->len ? memcmp(file + filelen - cur->len, cur->val, cur->len) : 0); if (((cur->len < filelen && file[filelen - cur->len - 1] == '/') || filelen == cur->len) && !memcmp(file + filelen - cur->len, cur->val, cur->len)) { phpdbg_breakfile_t *brake, new_brake;