diff options
Diffstat (limited to 'sapi/phpdbg')
| -rw-r--r-- | sapi/phpdbg/.phpdbginit | 16 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 2 | ||||
| -rwxr-xr-x | sapi/phpdbg/phpdbg.init.d | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_io.c | 8 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_parser.c | 10 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_parser.h | 10 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_print.c | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_set.c | 4 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_watch.c | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/web-bootstrap.php | 8 | ||||
| -rw-r--r-- | sapi/phpdbg/xml.md | 2 |
12 files changed, 34 insertions, 34 deletions
diff --git a/sapi/phpdbg/.phpdbginit b/sapi/phpdbg/.phpdbginit index 1ad35218ed..7ee34fccaa 100644 --- a/sapi/phpdbg/.phpdbginit +++ b/sapi/phpdbg/.phpdbginit @@ -25,7 +25,7 @@ */ /* -function my_debugging_function() +function my_debugging_function() { var_dump(func_get_args()); } @@ -49,31 +49,31 @@ if (function_exists('readline_completion_function')) { /* Setting argv made trivial ... - + argv 1 2 3 4 ^ set argv for next execution - + argv ^ unset argv for next execution - + */ function argv() { $argv = func_get_args(); - + if (!$argv) { $_SERVER['argv'] = array(); $_SERVER['argc'] = 0; return; } - + $_SERVER['argv'] = array_merge ( array("phpdbg"), $argv - ); + ); $_SERVER['argc'] = count($_SERVER['argv']); - + return $_SERVER['argv']; } :> diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 5af6ba619b..2a5ea29a0b 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1324,7 +1324,7 @@ void phpdbg_free_wrapper(void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) /* {{ { zend_mm_heap *heap = zend_mm_get_heap(); if (UNEXPECTED(heap == p)) { - /* TODO: heap maybe allocated by mmap(zend_mm_init) or malloc(USE_ZEND_ALLOC=0) + /* TODO: heap maybe allocated by mmap(zend_mm_init) or malloc(USE_ZEND_ALLOC=0) * let's prevent it from segfault for now */ } else { diff --git a/sapi/phpdbg/phpdbg.init.d b/sapi/phpdbg/phpdbg.init.d index 99a1ab328b..1f0b1fdbf9 100755 --- a/sapi/phpdbg/phpdbg.init.d +++ b/sapi/phpdbg/phpdbg.init.d @@ -44,7 +44,7 @@ insanity() return 1 fi fi - + return 0 } diff --git a/sapi/phpdbg/phpdbg_io.c b/sapi/phpdbg/phpdbg_io.c index 1bf7227b1f..150647aa7e 100644 --- a/sapi/phpdbg/phpdbg_io.c +++ b/sapi/phpdbg/phpdbg_io.c @@ -193,14 +193,14 @@ PHPDBG_API int phpdbg_mixed_read(int sock, char *ptr, int len, int tmo) { static int phpdbg_output_pager(int sock, const char *ptr, int len) { int count = 0, bytes = 0; const char *p = ptr, *endp = ptr + len; - + while ((p = memchr(p, '\n', endp - p))) { count++; p++; - + if (count % PHPDBG_G(lines) == 0) { bytes += write(sock, ptr + bytes, (p - ptr) - bytes); - + if (memchr(p, '\n', endp - p)) { char buf[PHPDBG_MAX_CMD]; zend_quiet_write(sock, ZEND_STRL("\r---Type <return> to continue or q <return> to quit---")); @@ -224,7 +224,7 @@ PHPDBG_API int phpdbg_mixed_write(int sock, const char *ptr, int len) { if (PHPDBG_G(flags) & PHPDBG_IS_REMOTE) { return phpdbg_send_bytes(sock, ptr, len); } - + if ((PHPDBG_G(flags) & PHPDBG_HAS_PAGINATION) && !(PHPDBG_G(flags) & PHPDBG_WRITE_XML) && PHPDBG_G(io)[PHPDBG_STDOUT].fd == sock diff --git a/sapi/phpdbg/phpdbg_parser.c b/sapi/phpdbg/phpdbg_parser.c index da08df2199..16ca21d5d1 100644 --- a/sapi/phpdbg/phpdbg_parser.c +++ b/sapi/phpdbg/phpdbg_parser.c @@ -1,19 +1,19 @@ /* A Bison parser, made by GNU Bison 2.7.12-4996. */ /* Bison implementation for Yacc-like parsers in C - + Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. - + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -26,7 +26,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ diff --git a/sapi/phpdbg/phpdbg_parser.h b/sapi/phpdbg/phpdbg_parser.h index d13cfbc0a5..2a27a4e7df 100644 --- a/sapi/phpdbg/phpdbg_parser.h +++ b/sapi/phpdbg/phpdbg_parser.h @@ -1,19 +1,19 @@ /* A Bison parser, made by GNU Bison 2.7.12-4996. */ /* Bison interface for Yacc-like parsers in C - + Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. - + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ @@ -26,7 +26,7 @@ special exception, which will cause the skeleton and the resulting Bison output files to be licensed under the GNU General Public License without this special exception. - + This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ diff --git a/sapi/phpdbg/phpdbg_print.c b/sapi/phpdbg/phpdbg_print.c index ed5633b845..bc1ac22f26 100644 --- a/sapi/phpdbg/phpdbg_print.c +++ b/sapi/phpdbg/phpdbg_print.c @@ -370,7 +370,7 @@ void phpdbg_print_opcodes_class(const char *class) { } } } ZEND_HASH_FOREACH_END(); - + return; } diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index fc25e30af1..70c02221aa 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -618,7 +618,7 @@ int phpdbg_compile(void) /* {{{ */ data->len += start_line_len; for (i = 1; i <= data->lines; i++) { data->line[i] += start_line_len; - } + } zend_hash_update_ptr(&PHPDBG_G(file_sources), PHPDBG_G(ops)->filename, data); } diff --git a/sapi/phpdbg/phpdbg_set.c b/sapi/phpdbg/phpdbg_set.c index 7cb8d0639f..dc69221a50 100644 --- a/sapi/phpdbg/phpdbg_set.c +++ b/sapi/phpdbg/phpdbg_set.c @@ -74,7 +74,7 @@ PHPDBG_SET(pagination) /* {{{ */ default: phpdbg_error("setpagination", "type=\"wrongargs\"", "set pagination used incorrectly: set pagination <on|off>"); } - + return SUCCESS; } /* }}} */ @@ -90,7 +90,7 @@ PHPDBG_SET(lines) /* {{{ */ default: phpdbg_error("setlines", "type=\"wrongargs\"", "set lines used incorrectly: set lines <number>"); } - + return SUCCESS; } /* }}} */ diff --git a/sapi/phpdbg/phpdbg_watch.c b/sapi/phpdbg/phpdbg_watch.c index 0c0df7f97a..8fa47ca1df 100644 --- a/sapi/phpdbg/phpdbg_watch.c +++ b/sapi/phpdbg/phpdbg_watch.c @@ -428,7 +428,7 @@ void phpdbg_update_watch_ref(phpdbg_watchpoint_t *watch) { phpdbg_store_watchpoint_btree(&coll->ref); phpdbg_activate_watchpoint(&coll->ref); phpdbg_watch_backup_data(&coll->ref); - + zend_hash_init(&coll->parents, 8, shitty stupid parameter, NULL, 0); zend_hash_index_add_ptr(&PHPDBG_G(watch_collisions), (zend_ulong) watch->ref, coll); } diff --git a/sapi/phpdbg/web-bootstrap.php b/sapi/phpdbg/web-bootstrap.php index 7b8c5d30de..046062997e 100644 --- a/sapi/phpdbg/web-bootstrap.php +++ b/sapi/phpdbg/web-bootstrap.php @@ -1,26 +1,26 @@ <?php /** * The following file shows how to bootstrap phpdbg so that you can mock specific server environments - * + * * eval include("web-bootstrap.php") * exec index.php * compile * break ... * run */ -if (!defined('PHPDBG_BOOTSTRAPPED')) +if (!defined('PHPDBG_BOOTSTRAPPED')) { /* define these once */ define("PHPDBG_BOOTPATH", "/opt/php-zts/htdocs"); define("PHPDBG_BOOTSTRAP", "index.php"); - define("PHPDBG_BOOTSTRAPPED", sprintf("/%s", PHPDBG_BOOTSTRAP)); + define("PHPDBG_BOOTSTRAPPED", sprintf("/%s", PHPDBG_BOOTSTRAP)); } /* * Superglobals are JIT, phpdbg will not over-write whatever you set during bootstrap */ -$_SERVER = array +$_SERVER = array ( 'HTTP_HOST' => 'localhost', 'HTTP_CONNECTION' => 'keep-alive', diff --git a/sapi/phpdbg/xml.md b/sapi/phpdbg/xml.md index 56dcaaa1f7..c02f80f2ca 100644 --- a/sapi/phpdbg/xml.md +++ b/sapi/phpdbg/xml.md @@ -297,7 +297,7 @@ info (subcommands) - <classinfo num="" /> with num having an integer value, indicating the number of loaded user-defined classes - Each class is enumerated with first a <class>, then an optional <parents> container and then a <classsource> element -- The <parents> container contains the <class> elements of the parent of the last <class> element. +- The <parents> container contains the <class> elements of the parent of the last <class> element. - <class type="" flags="" name="" methodcount="" /> - type: either "User" or "Internal" - flags: either "Interface", "Class" or "Abstract Class" |